From da69f4638126fab805c0a51ea4fc8488a6e82174 Mon Sep 17 00:00:00 2001
From: Yuriy Artamonov <yuriy.artamonov@jetbrains.com>
Date: Sun, 3 Aug 2025 09:22:27 +0200
Subject: [PATCH] [min-build] IJPL-198515 Move Java extension registrations to
 the appropriate place

GitOrigin-RevId: 0a6a95e82d9e7609acc88a78ab1f45626c848a67
---
 .../intellij.platform.customization.min.xml   | 14 +++++++---
 .../messages/JavaUiBundle.properties          |  6 ++++-
 .../resources/META-INF/JavaPlugin.xml         | 26 +++++++++----------
 .../src/messages/ActionsBundle.properties     |  7 +++--
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/idea/customization/min/resources/intellij.platform.customization.min.xml b/idea/customization/min/resources/intellij.platform.customization.min.xml
index 014626ac1a60..4bf8ef8b53e6 100644
--- a/idea/customization/min/resources/intellij.platform.customization.min.xml
+++ b/idea/customization/min/resources/intellij.platform.customization.min.xml
@@ -9,14 +9,10 @@
 
     <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"/>
@@ -24,6 +20,8 @@
     <moduleRendererFactory implementation="com.intellij.ide.util.DefaultModuleRendererFactory" order="last,before platform"/>
 
     <moduleConfigurationEditorProvider implementation="com.intellij.openapi.module.WebModuleConfigurationEditorProvider"/>
+
+    <editorNotificationProvider implementation="com.intellij.codeInsight.daemon.impl.SdkSetupNotificationProvider"/>
   </extensions>
 
   <actions resource-bundle="messages.ActionsBundle">
@@ -54,5 +52,13 @@
     <action id="ConsoleView.FoldLinesLikeThis" class="com.intellij.execution.console.FoldLinesLikeThis">
       <add-to-group group-id="ConsoleEditorPopupMenu" anchor="after" relative-to-action="$SearchWeb"/>
     </action>
+
+    <group id="MarkContentRootGroup">
+      <action id="MarkExcludeRoot" class="com.intellij.ide.projectView.actions.MarkExcludeRootAction"/>
+      <action id="MarkAsContentRoot" class="com.intellij.ide.projectView.actions.MarkAsContentRootAction"/>
+      <action id="UnmarkRoot" class="com.intellij.ide.projectView.actions.UnmarkRootAction"/>
+
+      <add-to-group group-id="MarkRootGroup" anchor="last"/>
+    </group>
   </actions>
 </idea-plugin>
diff --git a/java/idea-ui/resources/messages/JavaUiBundle.properties b/java/idea-ui/resources/messages/JavaUiBundle.properties
index e92a9b1b8839..6738ca7da381 100644
--- a/java/idea-ui/resources/messages/JavaUiBundle.properties
+++ b/java/idea-ui/resources/messages/JavaUiBundle.properties
@@ -749,4 +749,8 @@ feature.profiler.description.html=Gain <a href="{0}">insights</a> about your app
 feature.profiler.cpu=CPU and memory allocation profiling
 feature.profiler.memory=Memory snapshots
 feature.profiler.hints=In-editor performance hints
-progress.title.downloading=Downloading {0}\u2026
\ No newline at end of file
+progress.title.downloading=Downloading {0}\u2026
+
+group.Java.MarkRootGroup.text=Mark Directory As Java Roots
+group.MarkSourceRootGroup.text=Mark Directory As JVM Source Root
+group.MarkGeneratedSourceRootGroup.text=Mark As Generated Sources
\ No newline at end of file
diff --git a/java/java-impl/resources/META-INF/JavaPlugin.xml b/java/java-impl/resources/META-INF/JavaPlugin.xml
index 81e21f392d98..deeca835e45e 100644
--- a/java/java-impl/resources/META-INF/JavaPlugin.xml
+++ b/java/java-impl/resources/META-INF/JavaPlugin.xml
@@ -2791,22 +2791,8 @@
   </extensions>
 
   <actions>
-    <group id="Java.MarkRootGroup" searchable="false">
-      <group id="MarkSourceRootGroup" class="com.intellij.ide.projectView.actions.MarkSourceRootActionGroup"/>
-      <action id="MarkExcludeRoot" class="com.intellij.ide.projectView.actions.MarkExcludeRootAction"/>
-      <action id="MarkAsContentRoot" class="com.intellij.ide.projectView.actions.MarkAsContentRootAction"/>
-      <action id="UnmarkRoot" class="com.intellij.ide.projectView.actions.UnmarkRootAction"/>
-      <add-to-group group-id="MarkRootGroup"/>
-    </group>
-
     <action id="WelcomeScreen.CreateNewProject" class="com.intellij.ide.actions.NewProjectAction"/>
 
-    <group id="MarkGeneratedSourceRootGroup">
-      <action id="MarkGeneratedSourceRoot" class="com.intellij.ide.projectView.actions.MarkGeneratedSourceRootAction"/>
-      <action id="UnmarkGeneratedSourceRoot" class="com.intellij.ide.projectView.actions.UnmarkGeneratedSourceRootAction"/>
-      <add-to-group group-id="MarkRootGroup" anchor="after" relative-to-action="MarkSourceRootGroup"/>
-    </group>
-
     <group id="Java.ProjectTemplate.Group" searchable="false">
       <separator/>
       <action id="SaveProjectAsTemplate" class="com.intellij.platform.templates.SaveProjectAsTemplateAction"/>
@@ -2816,6 +2802,18 @@
   </actions>
 
   <actions resource-bundle="messages/JavaUiBundle">
+    <group id="Java.MarkRootGroup" searchable="false">
+      <!-- Java-only actions that operate with JVM source root types -->
+      <group id="MarkSourceRootGroup" class="com.intellij.ide.projectView.actions.MarkSourceRootActionGroup"/>
+
+      <group id="MarkGeneratedSourceRootGroup">
+        <action id="MarkGeneratedSourceRoot" class="com.intellij.ide.projectView.actions.MarkGeneratedSourceRootAction"/>
+        <action id="UnmarkGeneratedSourceRoot" class="com.intellij.ide.projectView.actions.UnmarkGeneratedSourceRootAction"/>
+      </group>
+
+      <add-to-group group-id="MarkRootGroup" anchor="before" relative-to-action="MarkContentRootGroup"/>
+    </group>
+
     <group id="JarRepositoryLibraries" internal="true" popup="true" searchable="false">
       <action internal="true" id="EnableAllRepositoryLibrariesSha256Checksum"
               class="com.intellij.ide.actions.EnableAllRepositoryLibrariesSha256ChecksumAction"/>
diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index 040829554cfe..67b532da22e1 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -1951,7 +1951,7 @@ action.ExtractModuleFromPackage.text=Extract Module\u2026
 action.ExtractModuleFromPackage.description=Extract a package to a separate module
 action.ImportModuleFromImlFile.text=Import Module
 action.ImportModuleFromImlFile.description=Import iml file as a module to the project
-group.MarkRootGroup.text=Mark Directory as
+group.MarkRootGroup.text=Mark Directory As
 action.CreateLauncherScript.text=Create Command Line Launcher\u2026
 action.CreateLauncherScript.description=Making the IDE accessible from the command line
 action.CreateDesktopEntry.text=Create Desktop Entry\u2026
@@ -1986,7 +1986,7 @@ action.EditorStickyLinesDisable.description=Hide the sticky lines panel
 action.EditorGutterToggleGlobalStickyLines.text=Show Sticky Lines
 action.EditorGutterToggleGlobalStickyLines.description=Show the sticky lines panel
 
-group.MarkFileAs.text=Mark File as
+group.MarkFileAs.text=Mark File As
 action.OverrideFileTypeAction.text=Override File Type
 action.OverrideFileTypeAction.description=Treat the current file as a file of different file type
 action.OverrideFileTypeAction.verbose.description=Treat file ''{0}''{1,choice,0#|1# (and {1} more files)} as a file of different file type
@@ -3005,7 +3005,6 @@ action.ShowInlineCompletionStatistics.text=Show Inline Completion Statistics
 action.RemoveBom.text=Remove BOM
 action.AddBom.text=Add BOM
 
-action.CloseSettings.text=Close Settings
 action.SettingsEditor.ToggleSidebar.text=Toggle Sidebar
 action.SettingsEditor.SaveChanges.text=Save Changes
 
@@ -3013,4 +3012,4 @@ action.DevKit.Bootstrap.text=Create IntelliJ IDEA Plugin\u2026
 # suppress inspection "UnusedProperty"
 action.DevKit.Bootstrap.synonym=Install Plugin DevKit
 
-action.UpdateIDEWithStation.text=Download {0}
\ No newline at end of file
+group.MarkContentRootGroup.text=Mark Directory As Content Root
\ No newline at end of file