From 844e3c714bd15b81b69683d503bcf7452c6f5d52 Mon Sep 17 00:00:00 2001
From: Mikhail Pyltsin <Mikhail.Pyltsin@jetbrains.com>
Date: Mon, 5 Jan 2026 13:49:21 +0100
Subject: [PATCH] [java-frontend] IDEA-366600 Get rid of additional "Java for
 JetBrains Client" plugin

- fix JavaCompileGroup

GitOrigin-RevId: 1cf7886b645a9a45dc8bc3018229e3ec91e98e6e
---
 .../resources/META-INF/JavaActions.xml         | 18 +++++++++---------
 .../resources/intellij.jvm.analysis.impl.xml   | 17 ++++++++---------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/java/java-backend/resources/META-INF/JavaActions.xml b/java/java-backend/resources/META-INF/JavaActions.xml
index 05bc844b5bc0..c21653d2ab0d 100644
--- a/java/java-backend/resources/META-INF/JavaActions.xml
+++ b/java/java-backend/resources/META-INF/JavaActions.xml
@@ -6,15 +6,6 @@
       <add-to-group group-id="FileChooserToolbar" anchor="after" relative-to-action="FileChooser.GotoProject"/>
     </action>
 
-    <group id="JavaCompileGroup">
-      <separator/>
-      <reference ref="ToggleMethodBreakpoint"/>
-      <reference ref="ToggleFieldBreakpoint"/>
-
-      <add-to-group group-id="ProjectViewCompileGroup" anchor="first"/>
-      <add-to-group group-id="StructureViewCompileGroup" anchor="first"/>
-    </group>
-
     <group id="NewGroup1" searchable="false">
       <action id="NewModuleInGroup" class="com.intellij.openapi.roots.ui.configuration.actions.NewModuleInGroupAction"
               icon="AllIcons.Nodes.Module"/>
@@ -189,6 +180,15 @@
     </group>
 
 
+    <group id="JavaCompileGroup">
+      <separator/>
+      <reference ref="ToggleMethodBreakpoint"/>
+      <reference ref="ToggleFieldBreakpoint"/>
+
+      <add-to-group group-id="ProjectViewCompileGroup" anchor="first"/>
+      <add-to-group group-id="StructureViewCompileGroup" anchor="first"/>
+    </group>
+
     <group id="AnalyzeJavaMenu">
       <separator/>
       <group id="ShowPackageDepsGroup">
diff --git a/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml b/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml
index c0184b393d25..ce7585997171 100644
--- a/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml
+++ b/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml
@@ -1,15 +1,14 @@
 <idea-plugin visibility="public">
   <dependencies>
-    <!--todo temporary disabled until it will be a backend module-->
 
-    <!--<module name="intellij.java.indexing"/>-->
-    <!--<module name="intellij.jvm.analysis"/>-->
-    <!--<module name="intellij.java"/>-->
-    <!--<module name="intellij.java.impl"/>-->
-    <!--<module name="intellij.jvm.analysis.refactoring"/>-->
-    <!--<module name="intellij.java.impl.refactorings"/>-->
-    <!--<module name="intellij.jvm.analysis.quickFix"/>-->
-    <!--<module name="intellij.java.codeserver.core"/>-->
+    <module name="intellij.java.indexing"/>
+    <module name="intellij.jvm.analysis"/>
+    <module name="intellij.java"/>
+    <module name="intellij.java.impl"/>
+    <module name="intellij.jvm.analysis.refactoring"/>
+    <module name="intellij.java.impl.refactorings"/>
+    <module name="intellij.jvm.analysis.quickFix"/>
+    <module name="intellij.java.codeserver.core"/>
 
     <module name="intellij.platform.backend"/>