[min-build] IJPL-198515 Changes in intellij.idea.customization.base lead to duplication of extension registrations

Introduce module intellij.platform.customization.min to share common registrations with Android Studio (cherry picked from commit 8bb0a1723b57b5e009c3327b04b3f527808e03e4) IJ-CR-170510 GitOrigin-RevId: cfcd89b8ad3a071e23696778d538687a3df6d784
2025-12-14 18:05:27 +07:00 · 2025-07-24 18:03:14 +02:00
parent 0761e7c4f2
commit 1d7260cb3f
8 changed files with 89 additions and 51 deletions
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -722,6 +722,7 @@
      <module fileurl="file://$PROJECT_DIR$/platform/credential-store/intellij.platform.credentialStore.iml" filepath="$PROJECT_DIR$/platform/credential-store/intellij.platform.credentialStore.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/credential-store-impl/intellij.platform.credentialStore.impl.iml" filepath="$PROJECT_DIR$/platform/credential-store-impl/intellij.platform.credentialStore.impl.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/credential-store-ui/intellij.platform.credentialStore.ui.iml" filepath="$PROJECT_DIR$/platform/credential-store-ui/intellij.platform.credentialStore.ui.iml" />
+      <module fileurl="file://$PROJECT_DIR$/idea/customization/min/intellij.platform.customization.min.iml" filepath="$PROJECT_DIR$/idea/customization/min/intellij.platform.customization.min.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-api/intellij.platform.debugger.iml" filepath="$PROJECT_DIR$/platform/xdebugger-api/intellij.platform.debugger.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-impl/intellij.platform.debugger.impl.iml" filepath="$PROJECT_DIR$/platform/xdebugger-impl/intellij.platform.debugger.impl.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml" filepath="$PROJECT_DIR$/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml" />
--- a/community-resources/BUILD.bazel
+++ b/community-resources/BUILD.bazel
@@ -16,6 +16,7 @@ java_library(
    "//java/ide-resources",
    "@lib//:idea-community-customization-tips-idea-ce",
    "//platform/platform-impl:ide-impl",
+    "//idea/customization/min",
    "//idea/customization/base",
    "//platform/experiment",
  ]
--- a/community-resources/intellij.idea.community.customization.iml
+++ b/community-resources/intellij.idea.community.customization.iml
@@ -25,6 +25,7 @@
      </library>
    </orderEntry>
    <orderEntry type="module" module-name="intellij.platform.ide.impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.customization.min" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.idea.customization.base" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.platform.experiment" scope="RUNTIME" />
  </component>
--- a/community-resources/resources/META-INF/IdeaPlugin.xml
+++ b/community-resources/resources/META-INF/IdeaPlugin.xml
@@ -6,7 +6,7 @@
  <module value="com.intellij.modules.idea.community"/>
  <module value="com.intellij.modules.java-capable"/>
  <module value="com.intellij.modules.python-core-capable"/> <!-- Python plugin can be installed -->
-  <module value="com.intellij.modules.python-in-non-pycharm-ide-capable"/> <!-- Enable Non-Pycharm-IDE support in Python plugin -->
+  <module value="com.intellij.modules.python-in-non-pycharm-ide-capable"/> <!-- Enable Non-Pycharm-IDE support in the Python plugin -->
  <module value="com.intellij.platform.ide.provisioner"/>

  <content>
@@ -17,6 +17,7 @@
    <module name="intellij.platform.ide.newUiOnboarding"/>
    <module name="intellij.platform.ide.newUsersOnboarding"/>
    <module name="intellij.ide.startup.importSettings"/>
+    <module name="intellij.platform.customization.min"/>
    <module name="intellij.idea.customization.base"/>
    <module name="intellij.idea.customization.backend"/>
    <module name="intellij.platform.tips"/>
--- a/idea/customization/base/resources/intellij.idea.customization.base.xml
+++ b/idea/customization/base/resources/intellij.idea.customization.base.xml
@@ -7,55 +7,5 @@
    <applicationActivity implementation="com.intellij.internal.statistic.updater.StatisticsJobsScheduler"/>
    <applicationActivity implementation="com.intellij.internal.statistic.updater.StatisticsStateCollectorsScheduler"/>
    <postStartupActivity implementation="com.intellij.internal.statistic.updater.StatisticsStateCollectorsScheduler$MyStartupActivity"/>
-
-    <projectViewPane implementation="com.intellij.ide.projectView.impl.ProjectViewPane"/>
-
-    <gotoRelatedProvider implementation="com.intellij.testIntegration.GotoTestRelatedProvider"/>
-
-    <daemon.highlightInfoFilter implementation="com.intellij.codeInsight.daemon.impl.HighlightInfoFilterImpl"/>
-
-    <projectConfigurable groupId="language" instance="com.intellij.psi.templateLanguages.TemplateDataLanguageConfigurable"
-                         id="Template Data Languages" key="template.data.language.configurable" bundle="messages.LangBundle"
-                         nonDefaultProject="true"/>
-
-    <editorNotificationProvider implementation="com.intellij.codeInsight.daemon.impl.SdkSetupNotificationProvider"/>
-
-    <projectTemplatesFactory implementation="com.intellij.platform.templates.ArchivedTemplatesFactory"/>
-    <applicationService serviceImplementation="com.intellij.platform.templates.ProjectTemplateExportable"/>
-    <projectTemplateFileProcessor implementation="com.intellij.platform.templates.SystemFileProcessor"/>
-
-    <moduleRendererFactory implementation="com.intellij.ide.util.DefaultModuleRendererFactory" order="last,before platform"/>
-
-    <moduleConfigurationEditorProvider implementation="com.intellij.openapi.module.WebModuleConfigurationEditorProvider"/>
  </extensions>
-
-  <actions resource-bundle="messages.ActionsBundle">
-    <action id="NewElement" class="com.intellij.ide.actions.NewElementAction">
-      <add-to-group group-id="ProjectViewToolbar" anchor="first"/>
-    </action>
-
-    <group id="OpenProjectGroup">
-      <group id="NewElementInMenuGroup" class="com.intellij.ide.actions.NewActionGroup" popup="true" searchable="false"/>
-      <add-to-group group-id="FileOpenGroup" anchor="first"/>
-    </group>
-
-    <group id="WelcomeScreen.DefaultNewProjectActionGroup" class="com.intellij.ide.actions.DefaultNewProjectActionGroup">
-      <add-to-group group-id="WelcomeScreen.QuickStart" anchor="first"/>
-    </group>
-
-    <action id="WelcomeScreen.DefaultNewProjectAction" class="com.intellij.ide.actions.DefaultNewProjectAction">
-      <add-to-group group-id="NewProjectOrModuleGroup"/>
-    </action>
-
-    <action id="WelcomeScreen.OpenProject" class="com.intellij.ide.actions.OpenFileAction$OnWelcomeScreen">
-      <add-to-group group-id="WelcomeScreen.QuickStart" anchor="before" relative-to-action="Vcs.VcsClone"/>
-    </action>
-
-    <action id="RerunFailedTests" class="com.intellij.execution.testframework.actions.RerunFailedTestsAction"
-            icon="AllIcons.RunConfigurations.RerunFailedTests"/>
-
-    <action id="ConsoleView.FoldLinesLikeThis" class="com.intellij.execution.console.FoldLinesLikeThis">
-      <add-to-group group-id="ConsoleEditorPopupMenu" anchor="after" relative-to-action="$SearchWeb"/>
-    </action>
-  </actions>
 </idea-plugin>
--- a/idea/customization/min/BUILD.bazel
+++ b/idea/customization/min/BUILD.bazel
@@ -0,0 +1,16 @@
+### auto-generated section `build intellij.platform.customization.min` start
+load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_jvm//:jvm.bzl", "jvm_resources")
+
+jvm_resources(
+  name = "min_resources",
+  files = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+java_library(
+  name = "min",
+  visibility = ["//visibility:public"],
+  runtime_deps = [":min_resources"]
+)
+### auto-generated section `build intellij.platform.customization.min` end
--- a/idea/customization/min/intellij.platform.customization.min.iml
+++ b/idea/customization/min/intellij.platform.customization.min.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>
--- a/idea/customization/min/resources/intellij.platform.customization.min.xml
+++ b/idea/customization/min/resources/intellij.platform.customization.min.xml
@@ -0,0 +1,57 @@
+<!--suppress PluginXmlRegistrationCheck -->
+<!-- Used by IDEs built on top of IntelliJ Platform to customize the IDE;
+     By using this customization, IDEs also get most of the behaviors of IntelliJ IDEA by default.
+     Other IDEs may differ still! -->
+<idea-plugin>
+  <extensions defaultExtensionNs="com.intellij">
+    <projectViewPane implementation="com.intellij.ide.projectView.impl.ProjectViewPane"/>
+
+    <gotoRelatedProvider implementation="com.intellij.testIntegration.GotoTestRelatedProvider"/>
+
+    <daemon.highlightInfoFilter implementation="com.intellij.codeInsight.daemon.impl.HighlightInfoFilterImpl"/>
+
+    <projectConfigurable groupId="language" instance="com.intellij.psi.templateLanguages.TemplateDataLanguageConfigurable"
+                         id="Template Data Languages" key="template.data.language.configurable" bundle="messages.LangBundle"
+                         nonDefaultProject="true"/>
+
+    <editorNotificationProvider implementation="com.intellij.codeInsight.daemon.impl.SdkSetupNotificationProvider"/>
+
+    <projectTemplatesFactory implementation="com.intellij.platform.templates.ArchivedTemplatesFactory"/>
+    <applicationService serviceImplementation="com.intellij.platform.templates.ProjectTemplateExportable"/>
+    <projectTemplateFileProcessor implementation="com.intellij.platform.templates.SystemFileProcessor"/>
+
+    <moduleRendererFactory implementation="com.intellij.ide.util.DefaultModuleRendererFactory" order="last,before platform"/>
+
+    <moduleConfigurationEditorProvider implementation="com.intellij.openapi.module.WebModuleConfigurationEditorProvider"/>
+  </extensions>
+
+  <actions resource-bundle="messages.ActionsBundle">
+    <action id="NewElement" class="com.intellij.ide.actions.NewElementAction">
+      <add-to-group group-id="ProjectViewToolbar" anchor="first"/>
+    </action>
+
+    <group id="OpenProjectGroup">
+      <group id="NewElementInMenuGroup" class="com.intellij.ide.actions.NewActionGroup" popup="true" searchable="false"/>
+      <add-to-group group-id="FileOpenGroup" anchor="first"/>
+    </group>
+
+    <group id="WelcomeScreen.DefaultNewProjectActionGroup" class="com.intellij.ide.actions.DefaultNewProjectActionGroup">
+      <add-to-group group-id="WelcomeScreen.QuickStart" anchor="first"/>
+    </group>
+
+    <action id="WelcomeScreen.DefaultNewProjectAction" class="com.intellij.ide.actions.DefaultNewProjectAction">
+      <add-to-group group-id="NewProjectOrModuleGroup"/>
+    </action>
+
+    <action id="WelcomeScreen.OpenProject" class="com.intellij.ide.actions.OpenFileAction$OnWelcomeScreen">
+      <add-to-group group-id="WelcomeScreen.QuickStart" anchor="before" relative-to-action="Vcs.VcsClone"/>
+    </action>
+
+    <action id="RerunFailedTests" class="com.intellij.execution.testframework.actions.RerunFailedTestsAction"
+            icon="AllIcons.RunConfigurations.RerunFailedTests"/>
+
+    <action id="ConsoleView.FoldLinesLikeThis" class="com.intellij.execution.console.FoldLinesLikeThis">
+      <add-to-group group-id="ConsoleEditorPopupMenu" anchor="after" relative-to-action="$SearchWeb"/>
+    </action>
+  </actions>
+</idea-plugin>