[python] PY-84398 get rid of embedded loading rules in PythonCore plugin, fix related issues

GitOrigin-RevId: 54f4bb333e0ca06a002a86c75f0bbc474863253e

.idea/modules.xml

@@ -1094,6 +1094,7 @@
       <module fileurl="file://$PROJECT_DIR$/python/python-ast/intellij.python.ast.iml" filepath="$PROJECT_DIR$/python/python-ast/intellij.python.ast.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/intellij.python.commonTests.iml" filepath="$PROJECT_DIR$/python/intellij.python.commonTests.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/openapi/intellij.python.community.iml" filepath="$PROJECT_DIR$/python/openapi/intellij.python.community.iml" />
+      <module fileurl="file://$PROJECT_DIR$/python/aliasProvider/intellij.python.community.aliasProvider.iml" filepath="$PROJECT_DIR$/python/aliasProvider/intellij.python.community.aliasProvider.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/intellij.python.community.communityOnly/intellij.python.community.communityOnly.iml" filepath="$PROJECT_DIR$/python/intellij.python.community.communityOnly/intellij.python.community.communityOnly.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-core-impl/intellij.python.community.core.impl.iml" filepath="$PROJECT_DIR$/python/python-core-impl/intellij.python.community.core.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-exec-service/intellij.python.community.execService.iml" filepath="$PROJECT_DIR$/python/python-exec-service/intellij.python.community.execService.iml" />

build/bazel-generated-file-list.txt

@@ -1304,6 +1304,7 @@ plugins/yaml
 plugins/yaml/backend
 python
 python/IntelliLang-python
+python/aliasProvider
 python/build
 python/build/build-debug-binaries
 python/huggingFace

python/IntelliLang-python/resources/intellij.python.langInjection.xml

@@ -1,5 +1,6 @@
 <idea-plugin package="com.intellij.python.langInjection">
   <dependencies>
+    <module name="intellij.python.community.impl"/>
     <module name="intellij.platform.langInjection"/>
   </dependencies>
   <extensions defaultExtensionNs="org.intellij.intelliLang">

python/aliasProvider/BUILD.bazel

@@ -0,0 +1,16 @@
+### auto-generated section `build intellij.python.community.aliasProvider` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources")
+
+jvm_resources(
+  name = "aliasProvider_resources",
+  files = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "aliasProvider",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  runtime_deps = [":aliasProvider_resources"]
+)
+### auto-generated section `build intellij.python.community.aliasProvider` end

python/aliasProvider/intellij.python.community.aliasProvider.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

python/aliasProvider/resources/intellij.python.community.aliasProvider.xml

@@ -0,0 +1,30 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.python.parser"/>
+    <module name="intellij.python.ast"/>
+    <module name="intellij.python.syntax.core"/>
+    <module name="intellij.python.syntax"/>
+    <module name="intellij.python.psi"/>
+    <module name="intellij.python.psi.impl"/>
+    <module name="intellij.python.sdk"/>
+    <module name="intellij.python.sdk.ui"/>
+    <module name="intellij.python.pyproject"/>
+    <module name="intellij.python.community.impl.poetry"/>
+    <module name="intellij.python.community.core.impl"/>
+    <module name="intellij.python.community.helpersLocator"/>
+    <module name="intellij.python.community"/>
+    <module name="intellij.python.community.impl"/>
+    <module name="intellij.python.community.execService"/>
+    <module name="intellij.python.community.execService.python"/>
+    <module name="intellij.python.community.impl.installer"/>
+    <module name="intellij.python.pydev"/>
+    <module name="intellij.python.community.impl.venv"/>
+    <module name="intellij.python.hatch"/>
+    <module name="intellij.python.community.services.shared"/>
+    <module name="intellij.python.community.services.internal.impl"/>
+    <module name="intellij.python.community.services.systemPython"/>
+    <module name="intellij.python.community.interpreters"/>
+  </dependencies>
+  <!-- Declare that we support core Python functionality -->
+  <module value="com.intellij.modules.python"/>
+</idea-plugin>

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

@@ -1,4 +1,8 @@
 <idea-plugin package="com.intellij.python.community.impl.huggingFace">
+  <dependencies>
+    <module name="intellij.json.backend"/>
+    <module name="intellij.python.community.impl"/>
+  </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <annotator language="Python" implementationClass="com.intellij.python.community.impl.huggingFace.annotation.HuggingFaceEntityNameAnnotator"/>
     <psi.referenceContributor implementation="com.intellij.python.community.impl.huggingFace.annotation.HuggingFaceIdentifierReferenceContributor"

python/ide/impl/intellij.pycharm.community.ide.impl.promotion/resources/intellij.pycharm.community.ide.impl.promotion.xml

@@ -2,7 +2,7 @@
   <!--Customization code for Community Pycharm only. Promotes PyCharm Prof.-->
 
   <dependencies>
-    <plugin id="PythonCore"/>
+    <plugin id="com.intellij.modules.python"/>
     <module name="intellij.pycharm.community.ide.impl"/>
   </dependencies>
 

python/ide/impl/resources/intellij.pycharm.community.ide.impl.xml

@@ -1,7 +1,7 @@
 <idea-plugin package="com.intellij.pycharm.community.ide.impl">
   <!--Customization code for both Community and Pro PyCharms-->
   <dependencies>
-    <plugin id="PythonCore"/>
+    <plugin id="com.intellij.modules.python"/>
     <module name="intellij.platform.whatsNew"/>
     <module name="intellij.platform.ide.nonModalWelcomeScreen"/>
   </dependencies>

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

@@ -3,4 +3,7 @@
     <module name="intellij.python.sdk"/>
     <module name="intellij.python.community"/>
   </dependencies>
+    <extensions defaultExtensionNs="com.intellij.statistics">
+        <counterUsagesCollector implementationClass="com.intellij.python.community.impl.installer.BinaryInstallerUsagesCollector"/>
+    </extensions>
 </idea-plugin>

python/intellij.python.community.communityOnly/resources/intellij.python.community.communityOnly.xml

@@ -1,6 +1,9 @@
 <!-- Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
 <idea-plugin package="com.intellij.python.community.communityOnly">
   <!--Community only, never professional: both plugin and DS -->
+  <dependencies>
+    <module name="intellij.python.community.impl"/>
+  </dependencies>
   <extensions defaultExtensionNs="com.jetbrains.python.console">
     <runnerFactory implementation="com.intellij.python.community.communityOnly.CommunityPydevConsoleRunnerFactory"/>
   </extensions>

python/intellij.python.ml.features/resources/intellij.python.ml.features.xml

@@ -2,6 +2,7 @@
   <dependencies>
     <module name="intellij.platform.ml.logs"/>
     <module name="intellij.python.psi.impl"/>
+    <module name="intellij.python.community.impl"/>
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <statistics.counterUsagesCollector implementationClass="com.intellij.python.ml.features.imports.PyCharmImportsRankingLogs"/>

python/pluginCore/impl/resources/intellij.python.community.plugin.impl.xml

@@ -3,6 +3,7 @@
   <dependencies>
     <!--Any IDE but NOT PyCharm-->
     <plugin id="com.intellij.modules.python-in-non-pycharm-ide-capable"/>
+    <module name="intellij.python.community.impl"/>
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">

python/pluginCore/plugin-content.yaml

@@ -1,79 +1,115 @@
-- name: lib/completion-ranking-python-with-full-line.jar
-  library: completion-ranking-python-with-full-line
-  module: intellij.python.community.impl
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-python-with-full-line/0/completion-ranking-python-with-full-line-0.jar
-- name: lib/io.github.z4kn4fein.semver.jvm.jar
-  library: io.github.z4kn4fein.semver.jvm
-  files:
-  - name: $MAVEN_REPOSITORY$/io/github/z4kn4fein/semver-jvm/2/semver-jvm-2.jar
-  reason: <- intellij.python.sdk.ui
-- name: lib/jackson-dataformat-yaml.jar
-  library: jackson-dataformat-yaml
-  files:
-  - name: $MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2/jackson-dataformat-yaml-2.jar
-  reason: <- intellij.python.community.impl
-- name: lib/jsr305.jar
-  library: jsr305
-  files:
-  - name: $MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3/jsr305-3.jar
-  reason: <- intellij.python.community.impl
-- name: lib/kaml.jar
-  library: kaml
-  files:
-  - name: $MAVEN_REPOSITORY$/com/charleskorn/kaml/kaml-jvm/0/kaml-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/it/krzeminski/snakeyaml-engine-kmp-jvm/3/snakeyaml-engine-kmp-jvm-3.jar
-  - name: $MAVEN_REPOSITORY$/net/thauvin/erik/urlencoder/urlencoder-lib-jvm/1/urlencoder-lib-jvm-1.jar
-  reason: <- intellij.python.community.impl
 - name: lib/libthrift.jar
   library: libthrift
   files:
   - name: $MAVEN_REPOSITORY$/org/apache/thrift/libthrift/0/libthrift-0.jar
   reason: withProjectLibrary
-- name: lib/ml-completion-prev-exprs-models.jar
-  library: ml-completion-prev-exprs-models
-  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/modules/intellij.platform.ide.nonModalWelcomeScreen.jar
   contentModules:
   - name: intellij.platform.ide.nonModalWelcomeScreen
+- name: lib/modules/intellij.python.ast.jar
+  contentModules:
+  - name: intellij.python.ast
+- name: lib/modules/intellij.python.community.aliasProvider.jar
+  contentModules:
+  - name: intellij.python.community.aliasProvider
+- name: lib/modules/intellij.python.community.core.impl.jar
+  contentModules:
+  - name: intellij.python.community.core.impl
+- name: lib/modules/intellij.python.community.execService.python.jar
+  contentModules:
+  - name: intellij.python.community.execService.python
+- name: lib/modules/intellij.python.community.helpersLocator.jar
+  contentModules:
+  - name: intellij.python.community.helpersLocator
+- name: lib/modules/intellij.python.community.impl.installer.jar
+  contentModules:
+  - name: intellij.python.community.impl.installer
+- name: lib/modules/intellij.python.community.impl.jar
+  projectLibraries:
+  - name: io.github.z4kn4fein.semver.jvm
+    files:
+    - name: $MAVEN_REPOSITORY$/io/github/z4kn4fein/semver-jvm/2/semver-jvm-2.jar
+    reason: <- intellij.python.community.impl
+  - name: jackson-dataformat-yaml
+    files:
+    - name: $MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2/jackson-dataformat-yaml-2.jar
+    reason: <- intellij.python.community.impl
+  - name: jsr305
+    files:
+    - name: $MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3/jsr305-3.jar
+    reason: <- intellij.python.community.impl
+  - name: kaml
+    files:
+    - name: $MAVEN_REPOSITORY$/com/charleskorn/kaml/kaml-jvm/0/kaml-jvm-0.jar
+    - name: $MAVEN_REPOSITORY$/it/krzeminski/snakeyaml-engine-kmp-jvm/3/snakeyaml-engine-kmp-jvm-3.jar
+    - name: $MAVEN_REPOSITORY$/net/thauvin/erik/urlencoder/urlencoder-lib-jvm/1/urlencoder-lib-jvm-1.jar
+    reason: <- intellij.python.community.impl
+  - name: 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
+  contentModules:
+  - name: intellij.python.community.impl
+    libraries:
+      ml-completion-prev-exprs-models:
+      - name: $MAVEN_REPOSITORY$/completion/ml/python/features/ml-completion-prev-exprs-models/1/ml-completion-prev-exprs-models-1.jar
+      completion-ranking-python-with-full-line:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-python-with-full-line/0/completion-ranking-python-with-full-line-0.jar
+- name: lib/modules/intellij.python.community.impl.poetry.jar
+  contentModules:
+  - name: intellij.python.community.impl.poetry
+- name: lib/modules/intellij.python.community.interpreters.jar
+  contentModules:
+  - name: intellij.python.community.interpreters
+- name: lib/modules/intellij.python.community.jar
+  contentModules:
+  - name: intellij.python.community
 - name: lib/modules/intellij.python.ml.features.jar
   contentModules:
   - name: intellij.python.ml.features
     libraries:
       jetbrains.ml.models.python.imports.ranking.model:
       - name: $MAVEN_REPOSITORY$/com/jetbrains/ml/models/python-imports-ranking-model/coral-panda-republished-4/python-imports-ranking-model-coral-panda-republished-4.jar
-- name: lib/python-ce-frontend.jar
+- name: lib/modules/intellij.python.parser.jar
   contentModules:
   - name: intellij.python.parser
-  - name: intellij.python.ast
+- name: lib/modules/intellij.python.psi.impl.jar
+  contentModules:
+  - name: intellij.python.psi.impl
+- name: lib/modules/intellij.python.psi.jar
+  contentModules:
+  - name: intellij.python.psi
+- name: lib/modules/intellij.python.pydev.jar
+  contentModules:
+  - name: intellij.python.pydev
+- name: lib/modules/intellij.python.sdk.jar
+  contentModules:
+  - name: intellij.python.sdk
+- name: lib/modules/intellij.python.sdk.ui.jar
+  contentModules:
+  - name: intellij.python.sdk.ui
+  library: io.github.z4kn4fein.semver.jvm
+  files:
+  - name: $MAVEN_REPOSITORY$/io/github/z4kn4fein/semver-jvm/2/semver-jvm-2.jar
+  reason: <- intellij.python.sdk.ui
+- name: lib/modules/intellij.python.syntax.core.jar
+  contentModules:
   - name: intellij.python.syntax.core
+- name: lib/modules/intellij.python.syntax.jar
+  contentModules:
   - name: intellij.python.syntax
-  - name: intellij.python.community.helpersLocator
 - name: lib/python-ce.jar
   modules:
   - name: intellij.python.community.plugin
   contentModules:
-  - name: intellij.python.psi
-  - name: intellij.python.psi.impl
-  - name: intellij.python.sdk
-  - name: intellij.python.sdk.ui
   - 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.execService.python
-  - 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.interpreters
   - name: intellij.python.community.plugin.minor
   - name: intellij.python.community.plugin.minorRider
   - name: intellij.python.community.communityOnly

python/pluginCore/resources/META-INF/plugin.xml

@@ -18,42 +18,37 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
 
   <vendor url="https://www.jetbrains.com/pycharm/">JetBrains</vendor>
 
-  <!-- Declare that we support core Python functionality -->
-  <module value="com.intellij.modules.python"/>
-
   <dependencies>
     <plugin id="com.intellij.modules.lang"/>
     <plugin id="com.intellij.modules.python-core-capable"/>
-    <module name="intellij.json.backend"/>
-    <plugin id="org.toml.lang"/>
-    <module name="intellij.libraries.kotlinx.io"/>
   </dependencies>
 
   <content>
-    <module name="intellij.python.parser" loading="embedded"/>
-    <module name="intellij.python.ast" loading="embedded"/>
-    <module name="intellij.python.syntax.core" loading="embedded"/>
-    <module name="intellij.python.syntax" loading="embedded"/>
-    <module name="intellij.python.psi" loading="embedded"/>
-    <module name="intellij.python.psi.impl" loading="embedded"/>
-    <module name="intellij.python.sdk" loading="embedded"/>
-    <module name="intellij.python.sdk.ui" loading="embedded"/>
-    <module name="intellij.python.pyproject" loading="embedded"/>
-    <module name="intellij.python.community.impl.poetry" loading="embedded"/>
-    <module name="intellij.python.community.core.impl" loading="embedded"/>
-    <module name="intellij.python.community.helpersLocator" loading="embedded"/>
-    <module name="intellij.python.community" loading="embedded"/>
-    <module name="intellij.python.community.impl" loading="embedded"/>
-    <module name="intellij.python.community.execService" loading="embedded"/>
-    <module name="intellij.python.community.execService.python" loading="embedded"/>
-    <module name="intellij.python.community.impl.installer" loading="embedded"/>
-    <module name="intellij.python.pydev" loading="embedded"/>
-    <module name="intellij.python.community.impl.venv" loading="embedded"/>
-    <module name="intellij.python.hatch" loading="embedded"/>
-    <module name="intellij.python.community.services.shared" loading="embedded"/>
-    <module name="intellij.python.community.services.internal.impl" loading="embedded"/>
-    <module name="intellij.python.community.services.systemPython" loading="embedded"/>
-    <module name="intellij.python.community.interpreters" loading="embedded"/>
+    <module name="intellij.python.parser" loading="required"/>
+    <module name="intellij.python.ast" loading="required"/>
+    <module name="intellij.python.syntax.core" loading="required"/>
+    <module name="intellij.python.syntax" loading="required"/>
+    <module name="intellij.python.psi" loading="required"/>
+    <module name="intellij.python.psi.impl" loading="required"/>
+    <module name="intellij.python.sdk" loading="required"/>
+    <module name="intellij.python.sdk.ui" loading="required"/>
+    <module name="intellij.python.pyproject" loading="required"/>
+    <module name="intellij.python.community.impl.poetry" loading="required"/>
+    <module name="intellij.python.community.core.impl" loading="required"/>
+    <module name="intellij.python.community.helpersLocator" loading="required"/>
+    <module name="intellij.python.community" loading="required"/>
+    <module name="intellij.python.community.impl" loading="required"/>
+    <module name="intellij.python.community.execService" loading="required"/>
+    <module name="intellij.python.community.execService.python" loading="required"/>
+    <module name="intellij.python.community.impl.installer" loading="required"/>
+    <module name="intellij.python.pydev" loading="required"/>
+    <module name="intellij.python.community.impl.venv" loading="required"/>
+    <module name="intellij.python.hatch" loading="required"/>
+    <module name="intellij.python.community.services.shared" loading="required"/>
+    <module name="intellij.python.community.services.internal.impl" loading="required"/>
+    <module name="intellij.python.community.services.systemPython" loading="required"/>
+    <module name="intellij.python.community.interpreters" loading="required"/>
+    <module name="intellij.python.community.aliasProvider" loading="required"/>
     <!--Mini-IDes support community python only-->
     <module name="intellij.python.community.plugin.minor"/> <!-- Python for Mini-IDEs-->
     <module name="intellij.python.community.plugin.minorRider"/> <!-- Python special support for Rider -->

python/pluginJava/resources/intellij.python.community.plugin.java.xml

@@ -3,6 +3,7 @@
   <dependencies>
     <!-- Supports Java -->
     <plugin id="com.intellij.java"/>
+    <module name="intellij.python.community.core.impl"/>
     <module name="intellij.python.community.plugin.impl"/>
   </dependencies>
 

python/pluginResources/intellij.python.community.impl.xml

@@ -2,12 +2,23 @@
   <dependencies>
     <module name="intellij.spellchecker"/>
     <module name="intellij.python.sdk"/>
+    <module name="intellij.python.syntax"/>
     <module name="intellij.python.community"/>
+    <module name="intellij.python.community.core.impl"/>
     <module name="intellij.python.community.helpersLocator"/>
     <module name="intellij.python.community.execService"/>
     <module name="intellij.python.community.execService.python"/>
     <module name="intellij.python.community.interpreters"/>
+    <module name="intellij.python.community.impl.poetry"/>
+    <module name="intellij.python.hatch"/>
+    <module name="intellij.python.pydev"/>
+    <module name="intellij.python.sdk.ui"/>
     <module name="intellij.regexp"/>
+    <module name="intellij.libraries.kotlinx.io"/>
+    <module name="intellij.python.pyproject"/>
+    <module name="intellij.python.community.impl.installer"/>
+    <module name="intellij.python.community.impl.venv"/>
+    <module name="intellij.python.community.services.systemPython"/>
   </dependencies>
 
   <resource-bundle>messages.PyBundle</resource-bundle>
@@ -18,7 +29,6 @@
                      key="INSP.poetry.package.versions.display.name" bundle="messages.PyBundle" groupKey="INSP.GROUP.python"
                      suppressId="PoetryPackageVersions" shortName="PoetryPackageVersionsInspection"/>
     <registryKey defaultValue="10" description="How ofter system pythons must be refreshed (minutes)" key="python.system.refresh.minutes"/>
-    <postStartupActivity implementation="com.intellij.python.community.services.systemPython.impl.SystemPythonInitialLoader"/>
     <fileType name="Requirements.txt"
               implementationClass="com.jetbrains.python.requirements.RequirementsFileType"
               fieldName="INSTANCE"
@@ -33,6 +43,18 @@
       implementationClass="com.jetbrains.python.requirements.RequirementsSyntaxHighlighterFactory"/>
     <multiHostInjector implementation="com.jetbrains.python.requirements.injection.TomlRequirementsLanguageInjector"/>
 
+    <codeInsight.declarativeInlayProvider group="TYPES_GROUP"
+                                          bundle="messages.PyPsiBundle"
+                                          implementationClass="com.jetbrains.python.inlayHints.PyTypeInlayHintsProvider"
+                                          isEnabledByDefault="true"
+                                          language="Python"
+                                          nameKey="INLAY.type.hints"
+                                          providerId="python.type.inlays">
+      <option bundle="messages.PyPsiBundle" descriptionKey="INLAY.reveal.type" enabledByDefault="true" nameKey="INLAY.reveal.type" optionId="python.type.inlays.reveal_type" />
+      <option bundle="messages.PyPsiBundle" descriptionKey="INLAY.function.return" enabledByDefault="false" nameKey="INLAY.function.return" optionId="python.type.inlays.function.return" />
+    </codeInsight.declarativeInlayProvider>
+
+
     <!-- Requirements.txt support. Can't extract module due to circular dependency between it and community.impl (RequirementsFile inspection)-->
     <completion.contributor language="Requirements"
                             implementationClass="com.jetbrains.python.requirements.RequirementsPackageNameCompletionContributor"/>
@@ -133,18 +155,14 @@
                     serviceImplementation="com.jetbrains.python.codeInsight.completion.DummyRemoteFilePathRetrievalService"
                     testServiceImplementation="com.jetbrains.python.codeInsight.completion.DummyRemoteFilePathRetrievalService"/>
 
-    <applicationService serviceImplementation="com.jetbrains.python.sdk.PySdkSettings"/>
     <applicationService serviceImplementation="com.jetbrains.python.packaging.pip.PypiPackageCache"/>
     <applicationService serviceImplementation="com.jetbrains.python.packaging.PyPackageService"/>
     <applicationService serviceInterface="com.jetbrains.python.module.PyModuleService"
                         serviceImplementation="com.jetbrains.python.module.PyModuleServiceImpl"/>
-    <applicationService serviceInterface="com.jetbrains.python.sdk.WinRegistryService"
-                        serviceImplementation="com.jetbrains.python.sdk.WinRegistryServiceImpl"/>
     <typedHandler implementation="com.jetbrains.python.codeInsight.PyMethodNameTypedHandler" id="pyMethodNameTypedHandler"/>
 
     <idIndexer filetype="Python" implementationClass="com.jetbrains.python.PyIdIndexer"/>
     <todoIndexer filetype="Python" implementationClass="com.jetbrains.python.PyTodoIndexer"/>
-    <indexPatternBuilder implementation="com.jetbrains.python.PyIndexPatternBuilder"/>
 
     <declarationRangeHandler key="com.jetbrains.python.psi.PyClass"
                              implementationClass="com.jetbrains.python.codeInsight.PyDeclarationRangeHandler"/>
@@ -177,6 +195,8 @@
     <xdebugger.attachDebuggerProvider implementation="com.jetbrains.python.debugger.attach.PyLocalAttachDebuggerProvider"/>
 
     <codeInsight.containerProvider implementation="com.jetbrains.python.codeInsight.PyContainerProvider"/>
+    <codeInsight.parameterNameHints language="Python"
+                                    implementationClass="com.jetbrains.python.inlayHints.PythonInlayParameterHintsProvider"/>
     <registryKey key="python.debugger.use.dispatcher" defaultValue="false" description="Use dispatcher in Python debugger"/>
     <registryKey key="flask.new.run.config" defaultValue="true" description="Flask Server Run configurations new UI"/>
     <registryKey key="pytest.new.run.config" defaultValue="true" description="PyTest configurations new UI"/>
@@ -521,19 +541,24 @@
     <statistics.counterUsagesCollector implementationClass="com.jetbrains.python.sdk.add.collector.PythonNewInterpreterAddedCollector"/>
     <statistics.counterUsagesCollector implementationClass="com.jetbrains.python.run.runAnything.PyRunAnythingCollector"/>
     <statistics.counterUsagesCollector implementationClass="com.jetbrains.python.debugger.statistics.PyDataViewerCollector"/>
-    <statistics.counterUsagesCollector implementationClass="com.intellij.python.community.impl.installer.BinaryInstallerUsagesCollector"/>
 
     <!-- Code-insight IDE bridge -->
+    <!--suppress PluginXmlRegistrationCheck -->
     <applicationService serviceInterface="com.jetbrains.python.PythonRuntimeService"
                         serviceImplementation="com.jetbrains.python.PythonRuntimeServiceImpl"/>
+    <!--suppress PluginXmlRegistrationCheck -->
     <applicationService serviceInterface="com.jetbrains.python.PythonUiService"
                         serviceImplementation="com.jetbrains.python.PythonUiServiceImpl"/>
+    <!--suppress PluginXmlRegistrationCheck -->
     <applicationService serviceInterface="com.jetbrains.python.codeInsight.imports.PyImportCollectorFactory"
                         serviceImplementation="com.jetbrains.python.codeInsight.imports.CodeStylePyImportCollectorFactory"/>
+    <!--suppress PluginXmlRegistrationCheck -->
     <applicationService serviceInterface="com.jetbrains.python.codeInsight.imports.ImportChooser"
                         serviceImplementation="com.jetbrains.python.codeInsight.imports.PyImportChooser"/>
+    <!--suppress PluginXmlRegistrationCheck -->
     <applicationService serviceInterface="com.jetbrains.python.refactoring.PyRefactoringUiService"
                         serviceImplementation="com.jetbrains.python.refactoring.PyRefactoringUiServiceImpl"/>
+    <!--suppress PluginXmlRegistrationCheck -->
     <applicationService serviceInterface="com.jetbrains.python.PythonDocumentationHighlightingService"
                         serviceImplementation="com.jetbrains.python.PythonDocumentationHighlightingServiceImpl"/>
 
@@ -697,9 +722,6 @@
     <extensionPoint qualifiedName="Pythonid.unresolvedReferenceQuickFixProvider"
                     interface="com.jetbrains.python.inspections.PyUnresolvedReferenceQuickFixProvider"
                     dynamic="true"/>
-    <extensionPoint qualifiedName="Pythonid.documentationLinkProvider"
-                    interface="com.jetbrains.python.documentation.PythonDocumentationLinkProvider"
-                    dynamic="true"/>
     <extensionPoint qualifiedName="Pythonid.runConfigurationExtension" interface="com.jetbrains.python.run.PythonRunConfigurationExtension"
                     dynamic="true"/>
     <extensionPoint qualifiedName="Pythonid.remoteInterpreterManager"
@@ -917,21 +939,6 @@
 
 
     <systemPythonProvider implementation="com.jetbrains.python.sdk.uv.UvSystemPythonProvider"/>
-    <systemPythonProvider implementation="com.intellij.python.community.services.systemPython.impl.providers.LegacySystemPythonProvider"/>
-
-    <systemPythonProvider implementation="com.intellij.python.community.services.systemPython.impl.providers.BrewSystemPythonProvider"
-                          os="mac"/>
-    <systemPythonProvider implementation="com.intellij.python.community.services.systemPython.impl.providers.MacSystemPythonProvider"
-                          os="mac"/>
-
-    <systemPythonProvider implementation="com.intellij.python.community.services.systemPython.impl.providers.WindowsSystemPythonProvider"
-                          os="windows"/>
-
-    <systemPythonProvider implementation="com.intellij.python.community.services.systemPython.impl.providers.AsdfSystemPythonProvider"/>
-    <systemPythonProvider implementation="com.intellij.python.community.services.systemPython.impl.providers.PyenvSystemPythonProvider"/>
-
-    <systemPythonProvider implementation="com.intellij.python.community.services.systemPython.impl.providers.UnixSystemPythonProvider"
-                          os="unix"/>
 
     <inspectionExtension implementation="com.jetbrains.python.sdk.configuration.suppressors.PyInterpreterInspectionSuppressor"/>
     <inspectionExtension implementation="com.jetbrains.python.inspections.PyUnresolvedReferenceDefaultInspectionExtension" order="last"/>

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

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

python/python-copyright/resources/intellij.python.copyright.xml

@@ -1,6 +1,7 @@
 <idea-plugin package="com.intellij.python.copyright">
   <dependencies>
     <plugin id="com.intellij.copyright"/>
+    <module name="intellij.python.community.impl"/>
   </dependencies>
   <extensions defaultExtensionNs="com.intellij.copyright">
     <updater filetype="Python" implementationClass="com.intellij.python.copyright.PyUpdateCopyrightsProvider"/>

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

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

python/python-features-trainer/resources/intellij.python.featuresTrainer.xml

@@ -1,6 +1,8 @@
 <idea-plugin package="com.intellij.python.featuresTrainer">
   <dependencies>
     <plugin id="training"/>
+    <module name="intellij.python.community.impl"/>
+    <module name="intellij.python.community.services.systemPython"/>
   </dependencies>
   <extensions defaultExtensionNs="training">
     <ift.language.extension language="Python" defaultProductName="PyCharm"

python/python-grazie/resources/intellij.python.grazie.xml

@@ -1,5 +1,6 @@
 <idea-plugin package="com.intellij.python.grazie">
 <dependencies>
+  <module name="intellij.python.community.impl"/>
   <plugin id="tanvd.grazi"/>
 </dependencies>
   <extensions defaultExtensionNs="com.intellij.grazie">

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

@@ -4,6 +4,7 @@
     <module name="intellij.python.community.execService"/>
     <module name="intellij.python.sdk"/>
     <module name="intellij.python.sdk.ui"/>
+    <module name="intellij.python.pyproject"/>
   </dependencies>
 
   <extensions defaultExtensionNs="Pythonid">

python/python-markdown/resources/intellij.python.markdown.xml

@@ -1,6 +1,7 @@
 <idea-plugin package="com.intellij.python.markdown">
   <dependencies>
     <plugin id="org.intellij.plugins.markdown"/>
+    <module name="intellij.python.community.impl"/>
   </dependencies>
   <extensions defaultExtensionNs="org.intellij.markdown">
     <fenceLanguageProvider implementation="com.intellij.python.markdown.PyCodeFenceLanguageProvider"/>

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

@@ -7,7 +7,6 @@
                     interface="com.jetbrains.python.psi.resolve.PyReferenceResolveProvider"
                     dynamic="true"/>
     <extensionPoint qualifiedName="Pythonid.typeProvider" interface="com.jetbrains.python.psi.impl.PyTypeProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="Pythonid.typeHintProvider" interface="com.jetbrains.python.codeInsight.typing.PyTypeHintProvider" dynamic="true"/>
     <extensionPoint qualifiedName="Pythonid.pySuperMethodsSearch" interface="com.intellij.util.QueryExecutor" dynamic="true"/>
     <extensionPoint qualifiedName="Pythonid.pyClassMembersProvider"
                     interface="com.jetbrains.python.psi.types.PyClassMembersProvider"
@@ -22,9 +21,6 @@
     <extensionPoint qualifiedName="Pythonid.pyModuleMembersProvider"
                     interface="com.jetbrains.python.psi.types.PyModuleMembersProvider"
                     dynamic="true"/>
-    <extensionPoint qualifiedName="Pythonid.knownDecoratorProvider"
-                    interface="com.jetbrains.python.psi.PyKnownDecoratorProvider"
-                    dynamic="true"/>
     <extensionPoint qualifiedName="Pythonid.canonicalPathProvider"
                     interface="com.jetbrains.python.psi.resolve.PyCanonicalPathProvider"
                     dynamic="true"/>

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

@@ -1,11 +1,21 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.python.psi"/>
+    <module name="intellij.python.community"/>
     <module name="intellij.python.community.helpersLocator"/>
   </dependencies>
 
   <extensionPoints>
     <extensionPoint qualifiedName="Pythonid.pyAnnotator" interface="com.jetbrains.python.validation.PyAnnotator" dynamic="true"/>
+
+    <extensionPoint qualifiedName="Pythonid.documentationLinkProvider"
+                    interface="com.jetbrains.python.documentation.PythonDocumentationLinkProvider"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="Pythonid.knownDecoratorProvider"
+                    interface="com.jetbrains.python.psi.PyKnownDecoratorProvider"
+                    dynamic="true"/>
+
+    <extensionPoint qualifiedName="Pythonid.typeHintProvider" interface="com.jetbrains.python.codeInsight.typing.PyTypeHintProvider" dynamic="true"/>
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
@@ -54,6 +64,7 @@
     <definitionsSearch implementation="com.jetbrains.python.psi.search.PyDefinitionsSearch"/>
 
     <stubElementTypeHolder class="com.jetbrains.python.PyStubElementTypes" externalIdPrefix="py."/>
+    <indexPatternBuilder implementation="com.jetbrains.python.PyIndexPatternBuilder"/>
 
     <gotoDeclarationHandler implementation="com.jetbrains.python.codeInsight.PyBreakContinueGotoProvider" order="FIRST"/>
     <gotoDeclarationHandler implementation="com.jetbrains.python.psi.impl.PyGotoDeclarationHandler"/>
@@ -259,237 +270,260 @@
     <localInspection language="Python" shortName="PyEnumInspection" suppressId="PyEnum" bundle="messages.PyPsiBundle" key="INSP.NAME.enum" groupKey="INSP.GROUP.python" enabledByDefault="true" level="WARNING" implementationClass="com.jetbrains.python.inspections.PyEnumInspection"/>
     <localInspection language="Python" shortName="PyNewTypeInspection" suppressId="PyNewType" bundle="messages.PyPsiBundle" key="INSP.NAME.new.type" groupKey="INSP.GROUP.python" enabledByDefault="true" level="WARNING" implementationClass="com.jetbrains.python.inspections.PyNewTypeInspection"/>
 
-    <codeInsight.parameterNameHints language="Python"
-                                    implementationClass="com.jetbrains.python.inlayHints.PythonInlayParameterHintsProvider"/>
-
-    <codeInsight.declarativeInlayProvider group="TYPES_GROUP"
-                                          bundle="messages.PyPsiBundle"
-                                          implementationClass="com.jetbrains.python.inlayHints.PyTypeInlayHintsProvider"
-                                          isEnabledByDefault="true"
-                                          language="Python"
-                                          nameKey="INLAY.type.hints"
-                                          providerId="python.type.inlays">
-      <option bundle="messages.PyPsiBundle" descriptionKey="INLAY.reveal.type" enabledByDefault="true" nameKey="INLAY.reveal.type" optionId="python.type.inlays.reveal_type" />
-      <option bundle="messages.PyPsiBundle" descriptionKey="INLAY.function.return" enabledByDefault="false" nameKey="INLAY.function.return" optionId="python.type.inlays.function.return" />
-    </codeInsight.declarativeInlayProvider>
-
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyConvertMethodToPropertyIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.ImportToImportFromIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyConvertStaticMethodToFunctionIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.SpecifyTypeInDocstringIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyHideTypeAnnotationsIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.SpecifyTypeInPy3AnnotationsIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyAnnotateTypesIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.TypeAssertionIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.ImportFromToImportIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyAbsoluteToRelativeImportIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyRelativeToAbsoluteImportIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.ImportToggleAliasIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PySplitIfIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyNegateComparisonIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyStringConcatenationToFormatIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.ConvertFormatOperatorToMethodIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyFlipComparisonIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyDemorganIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.ReplaceListComprehensionWithForIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyJoinIfIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyDictConstructorToLiteralFormIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyDictLiteralFormToConstructorIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyQuotedStringIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyFStringToTStringIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyConvertLambdaToFunctionIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.ConvertVariadicParamIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyConvertTripleQuotedStringIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyConvertLiteralToTupleIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyConvertLiteralToListIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyConvertLiteralToSetIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyTransformConditionalExpressionIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyGenerateDocstringIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyYieldFromIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.convertToFString.PyConvertToFStringIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyConvertTypeCommentToVariableAnnotationIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyAnnotateVariableTypeIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>
     </intentionAction>
 
     <intentionAction>
+      <language>Python</language>
       <className>com.jetbrains.python.codeInsight.intentions.PyInvertIfConditionIntention</className>
       <bundleName>messages.PyPsiBundle</bundleName>
       <categoryKey>INTN.category.python</categoryKey>

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

@@ -3,5 +3,6 @@
     <module name="intellij.python.community"/>
     <module name="intellij.python.psi.impl"/>
     <module name="intellij.python.sdk"/>
+    <plugin id="org.toml.lang"/>
   </dependencies>
 </idea-plugin>

python/python-restructuredtext/resources/intellij.restructuredtext.python.xml

@@ -1,6 +1,6 @@
 <idea-plugin package="com.intellij.restructuredtext.python">
   <dependencies>
-    <plugin id="PythonCore"/>
+    <plugin id="com.intellij.modules.python"/>
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">

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

@@ -1,6 +1,7 @@
 <idea-plugin>
   <dependencies>
     <module name="intellij.python.psi.impl"/>
+    <module name="intellij.python.community"/>
     <module name="intellij.python.community.helpersLocator"/>
   </dependencies>
   <extensionPoints>
@@ -14,5 +15,8 @@
   </extensionPoints>
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceImplementation="com.jetbrains.python.packaging.PyCondaPackageService"/>
+    <applicationService serviceInterface="com.jetbrains.python.sdk.WinRegistryService"
+                        serviceImplementation="com.jetbrains.python.sdk.WinRegistryServiceImpl"/>
+    <applicationService serviceImplementation="com.jetbrains.python.sdk.PySdkSettings"/>
   </extensions>
 </idea-plugin>

python/python-terminal/resources/intellij.python.terminal.xml

@@ -1,5 +1,6 @@
 <idea-plugin package="com.intellij.python.terminal">
   <dependencies>
+    <module name="intellij.python.community.impl"/>
     <plugin id="org.jetbrains.plugins.terminal"/>
   </dependencies>
   <extensions defaultExtensionNs="org.jetbrains.plugins.terminal">

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

@@ -4,5 +4,6 @@
     <module name="intellij.python.psi.impl"/>
     <module name="intellij.python.sdk"/>
     <module name="intellij.python.community.execService.python"/>
+    <module name="intellij.python.community.services.shared"/>
   </dependencies>
 </idea-plugin>

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

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

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

@@ -5,5 +5,30 @@
     <module name="intellij.python.sdk"/>
     <module name="intellij.python.community.execService"/>
     <module name="intellij.python.community.impl.venv"/>
+    <module name="intellij.python.community.services.shared"/>
+    <module name="intellij.python.community.services.internal.impl"/>
+    <module name="intellij.python.community.impl.installer"/>
   </dependencies>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <postStartupActivity implementation="com.intellij.python.community.services.systemPython.impl.SystemPythonInitialLoader"/>
+  </extensions>
+  <extensions defaultExtensionNs="Pythonid">
+    <systemPythonProvider implementation="com.intellij.python.community.services.systemPython.impl.providers.LegacySystemPythonProvider"/>
+
+    <systemPythonProvider implementation="com.intellij.python.community.services.systemPython.impl.providers.BrewSystemPythonProvider"
+                          os="mac"/>
+    <systemPythonProvider implementation="com.intellij.python.community.services.systemPython.impl.providers.MacSystemPythonProvider"
+                          os="mac"/>
+
+    <systemPythonProvider implementation="com.intellij.python.community.services.systemPython.impl.providers.WindowsSystemPythonProvider"
+                          os="windows"/>
+
+    <systemPythonProvider implementation="com.intellij.python.community.services.systemPython.impl.providers.AsdfSystemPythonProvider"/>
+    <systemPythonProvider implementation="com.intellij.python.community.services.systemPython.impl.providers.PyenvSystemPythonProvider"/>
+
+    <systemPythonProvider implementation="com.intellij.python.community.services.systemPython.impl.providers.UnixSystemPythonProvider"
+                          os="unix"/>
+
+  </extensions>
 </idea-plugin>

python/services/system-python/testResources/META-INF/plugin.xml

@@ -2,7 +2,7 @@
 
   <id>pycharm.systemPython.tests</id>
   <dependencies>
-    <plugin id="PythonCore"/>
+    <plugin id="com.intellij.modules.python"/>
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <applicationInitializedListener implementation="com.intellij.python.junit5Tests.env.systemPython.SystemPythonRootsFixer"/>

python/setup-test-environment/resources/intellij.python.community.testFramework.testEnv.xml

@@ -1,5 +1,5 @@
 <idea-plugin>
   <dependencies>
-    <plugin id="PythonCore"/>
+    <plugin id="com.intellij.modules.python"/>
   </dependencies>
 </idea-plugin>