[python] PY-84398 get rid of package prefix in python modules.

It doesn't work. Sad, but true. GitOrigin-RevId: c6cf4f2971ce813a2ce18afb2dcee22c2c5dad75
2026-04-20 13:31:28 +07:00 · 2025-09-23 17:40:49 +02:00
parent 966832b3a8
commit c5b44ca085
28 changed files with 79 additions and 25 deletions
--- a/python/IntelliLang-python/resources/intellij.python.langInjection.xml
+++ b/python/IntelliLang-python/resources/intellij.python.langInjection.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.langInjection">
+<idea-plugin>
  <dependencies>
    <module name="intellij.python.community.impl"/>
    <module name="intellij.platform.langInjection"/>
--- a/python/aliasProvider/BUILD.bazel
+++ b/python/aliasProvider/BUILD.bazel
@@ -11,6 +11,32 @@ jvm_library(
  name = "aliasProvider",
  visibility = ["//visibility:public"],
  srcs = glob([], allow_empty = True),
-  runtime_deps = [":aliasProvider_resources"]
+  runtime_deps = [
+    ":aliasProvider_resources",
+    "//python/python-parser:parser",
+    "//python/python-ast:ast",
+    "//python/python-syntax-core:syntax-core",
+    "//python/python-syntax:syntax",
+    "//python/python-psi-api:psi",
+    "//python/python-psi-impl:psi-impl",
+    "//python/python-sdk:sdk",
+    "//python/python-sdk-ui:sdk-ui",
+    "//python/python-pyproject:pyproject",
+    "//python/poetry",
+    "//python/python-core-impl:community-core-impl",
+    "//python/impl.helperLocator:community-helpersLocator",
+    "//python/openapi:community",
+    "//python:python-community-impl",
+    "//python/python-exec-service:community-execService",
+    "//python/python-exec-service/execService.python",
+    "//python/installer",
+    "//python:python-pydev",
+    "//python/python-venv:community-impl-venv",
+    "//python/python-hatch:hatch",
+    "//python/services/internal-impl:python-community-services-internal-impl",
+    "//python/services/shared",
+    "//python/services/system-python",
+    "//python/interpreters",
+  ]
 )
 ### auto-generated section `build intellij.python.community.aliasProvider` end
--- a/python/aliasProvider/intellij.python.community.aliasProvider.iml
+++ b/python/aliasProvider/intellij.python.community.aliasProvider.iml
@@ -7,5 +7,29 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.python.parser" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.ast" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.syntax.core" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.syntax" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.psi" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.psi.impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.sdk" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.sdk.ui" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.pyproject" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.community.impl.poetry" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.community.core.impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.community.helpersLocator" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.community" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.community.impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.community.execService" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.community.execService.python" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.community.impl.installer" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.pydev" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.community.impl.venv" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.hatch" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.community.services.internal.impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.community.services.shared" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.community.services.systemPython" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.community.interpreters" scope="RUNTIME" />
  </component>
 </module>
--- a/python/huggingFace/resources/intellij.python.community.impl.huggingFace.xml
+++ b/python/huggingFace/resources/intellij.python.community.impl.huggingFace.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.community.impl.huggingFace">
+<idea-plugin>
  <dependencies>
    <module name="intellij.json.backend"/>
    <module name="intellij.python.community.impl"/>
--- a/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/resources/intellij.pycharm.community.ide.impl.promotion.xml
+++ b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/resources/intellij.pycharm.community.ide.impl.promotion.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.pycharm.community.ide.impl.promotion">
+<idea-plugin>
  <!--Customization code for Community Pycharm only. Promotes PyCharm Prof.-->

  <dependencies>
--- a/python/ide/impl/resources/intellij.pycharm.community.ide.impl.xml
+++ b/python/ide/impl/resources/intellij.pycharm.community.ide.impl.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.pycharm.community.ide.impl">
+<idea-plugin>
  <!--Customization code for both Community and Pro PyCharms-->
  <dependencies>
    <plugin id="com.intellij.modules.python"/>
--- a/python/ide/implTraining/intellij.pycharm.community.ide.implTraining/resources/intellij.pycharm.community.ide.implTraining.xml
+++ b/python/ide/implTraining/intellij.pycharm.community.ide.implTraining/resources/intellij.pycharm.community.ide.implTraining.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.pycharm.community.ide.implTraining">
+<idea-plugin>
  <dependencies>
    <plugin id="training"/>
    <module name="intellij.python.featuresTrainer"/>
--- a/python/intellij.python.community.communityOnly/resources/intellij.python.community.communityOnly.xml
+++ b/python/intellij.python.community.communityOnly/resources/intellij.python.community.communityOnly.xml
@@ -1,5 +1,5 @@
 <!-- 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">
+<idea-plugin>
  <!--Community only, never professional: both plugin and DS -->
  <dependencies>
    <module name="intellij.python.community.impl"/>
--- a/python/intellij.python.ml.features/resources/intellij.python.ml.features.xml
+++ b/python/intellij.python.ml.features/resources/intellij.python.ml.features.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.ml.features">
+<idea-plugin>
  <dependencies>
    <module name="intellij.platform.ml.logs"/>
    <module name="intellij.python.psi.impl"/>
--- a/python/pluginCore/BUILD.bazel
+++ b/python/pluginCore/BUILD.bazel
@@ -18,6 +18,8 @@ jvm_library(
    "//python/services/system-python",
    "//python/services/shared",
    "//json/backend",
+    "//python/aliasProvider",
+    "//python/impl.helperLocator:community-helpersLocator",
  ]
 )
 ### auto-generated section `build intellij.python.community.plugin` end
--- a/python/pluginCore/impl/resources/intellij.python.community.plugin.impl.xml
+++ b/python/pluginCore/impl/resources/intellij.python.community.plugin.impl.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.community.plugin.impl">
+<idea-plugin>
  <!--Plugin for other (not PyCharm) IDEs, including IU-->
  <dependencies>
    <!--Any IDE but NOT PyCharm-->
--- a/python/pluginCore/intellij.python.community.plugin.iml
+++ b/python/pluginCore/intellij.python.community.plugin.iml
@@ -12,5 +12,7 @@
    <orderEntry type="module" module-name="intellij.python.community.services.systemPython" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.python.community.services.shared" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.json.backend" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.community.aliasProvider" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.community.helpersLocator" scope="RUNTIME" />
  </component>
 </module>
--- a/python/pluginJava/resources/intellij.python.community.plugin.java.xml
+++ b/python/pluginJava/resources/intellij.python.community.plugin.java.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.community.plugin.java">
+<idea-plugin>
  <!--For IU or IC-->
  <dependencies>
    <!-- Supports Java -->
--- a/python/pluginMinor/resources/intellij.python.community.plugin.minor.xml
+++ b/python/pluginMinor/resources/intellij.python.community.plugin.minor.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.community.plugin.minor">
+<idea-plugin>
  <dependencies>
    <!--Any IDE but NOT PyCharm-->
    <plugin id="com.intellij.modules.python-in-non-pycharm-ide-capable"/>
--- a/python/pluginMinorRider/resources/intellij.python.community.plugin.minorRider.xml
+++ b/python/pluginMinorRider/resources/intellij.python.community.plugin.minorRider.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.community.plugin.minorRider">
+<idea-plugin>
  <dependencies>
    <!--Any IDE but NOT PyCharm-->
    <plugin id="com.intellij.modules.python-in-non-pycharm-ide-capable"/>
--- a/python/python-copyright/resources/intellij.python.copyright.xml
+++ b/python/python-copyright/resources/intellij.python.copyright.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.copyright">
+<idea-plugin>
  <dependencies>
    <plugin id="com.intellij.copyright"/>
    <module name="intellij.python.community.impl"/>
--- a/python/python-exec-service/resources/intellij.python.community.execService.xml
+++ b/python/python-exec-service/resources/intellij.python.community.execService.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.community.execService">
+<idea-plugin>
  <dependencies>
    <module name="intellij.python.community"/>
    <module name="intellij.python.community.helpersLocator"/>
--- a/python/python-features-trainer/resources/intellij.python.featuresTrainer.xml
+++ b/python/python-features-trainer/resources/intellij.python.featuresTrainer.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.featuresTrainer">
+<idea-plugin>
  <dependencies>
    <plugin id="training"/>
    <module name="intellij.python.community.impl"/>
--- a/python/python-grazie/resources/intellij.python.grazie.xml
+++ b/python/python-grazie/resources/intellij.python.grazie.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.grazie">
+<idea-plugin>
 <dependencies>
  <module name="intellij.python.community.impl"/>
  <plugin id="tanvd.grazi"/>
--- a/python/python-hatch/resources/intellij.python.hatch.xml
+++ b/python/python-hatch/resources/intellij.python.hatch.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.hatch">
+<idea-plugin>
  <dependencies>
    <module name="intellij.python.community"/>
    <module name="intellij.python.community.execService"/>
--- a/python/python-markdown/resources/intellij.python.markdown.xml
+++ b/python/python-markdown/resources/intellij.python.markdown.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.markdown">
+<idea-plugin>
  <dependencies>
    <plugin id="org.intellij.plugins.markdown"/>
    <module name="intellij.python.community.impl"/>
--- a/python/python-pyproject/resources/intellij.python.pyproject.xml
+++ b/python/python-pyproject/resources/intellij.python.pyproject.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.pyproject">
+<idea-plugin>
  <dependencies>
    <module name="intellij.python.community"/>
    <module name="intellij.python.psi.impl"/>
--- a/python/python-restructuredtext/resources/intellij.restructuredtext.python.xml
+++ b/python/python-restructuredtext/resources/intellij.restructuredtext.python.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.restructuredtext.python">
+<idea-plugin>
  <dependencies>
    <plugin id="com.intellij.modules.python"/>
  </dependencies>
--- a/python/python-terminal/resources/intellij.python.terminal.xml
+++ b/python/python-terminal/resources/intellij.python.terminal.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.terminal">
+<idea-plugin>
  <dependencies>
    <module name="intellij.python.community.impl"/>
    <plugin id="org.jetbrains.plugins.terminal"/>
--- a/python/python-venv/resources/intellij.python.community.impl.venv.xml
+++ b/python/python-venv/resources/intellij.python.community.impl.venv.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.community.impl.venv">
+<idea-plugin>
  <dependencies>
    <module name="intellij.python.community"/>
    <module name="intellij.python.community.execService"/>
--- 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
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.community.services.internal.impl">
+<idea-plugin>
  <dependencies>
    <module name="intellij.python.community"/>
    <module name="intellij.python.psi.impl"/>
--- a/python/services/shared/resources/intellij.python.community.services.shared.xml
+++ b/python/services/shared/resources/intellij.python.community.services.shared.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.community.services.shared">
+<idea-plugin>
  <dependencies>
    <module name="intellij.python.community.execService.python"/>
    <module name="intellij.python.community"/>
--- a/python/services/system-python/resources/intellij.python.community.services.systemPython.xml
+++ b/python/services/system-python/resources/intellij.python.community.services.systemPython.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.python.community.services.systemPython">
+<idea-plugin>
  <dependencies>
    <module name="intellij.python.community"/>
    <module name="intellij.python.psi.impl"/>