[java-intentions] ModifierFix: Avoid adding modifier on separate line if modifier list consists of annotations only

IJ-CR-102194

GitOrigin-RevId: 50d4f16ee583d75be79f8c77126a5d20944bddef

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java

@@ -157,7 +157,13 @@ public class ModifierFix extends LocalQuickFixAndIntentionActionOnPsiElement imp
 
   private void changeModifierList (@NotNull PsiModifierList modifierList) {
     try {
+      boolean needRemoveWhiteSpace = modifierList.getLastChild() instanceof PsiAnnotation &&
+                                     modifierList.getNextSibling() instanceof PsiWhiteSpace &&
+                                     myShouldHave;
       modifierList.setModifierProperty(myModifier, myShouldHave);
+      if (needRemoveWhiteSpace) {
+        modifierList.getNextSibling().delete();
+      }
     }
     catch (IncorrectOperationException e) {
       LOG.error(e);

plugins/devkit/devkit-java-tests/testData/inspections/lightServiceMustBeFinal/MakeFinalMultiLineModifierList.java

@@ -0,0 +1,6 @@
+import com.intellij.openapi.components.Service;
+
+@Service
+strictfp
+class <error descr="Light service must be final">MyService<caret></error> {
+}

plugins/devkit/devkit-java-tests/testData/inspections/lightServiceMustBeFinal/MakeFinalMultiLineModifierList_after.java

@@ -0,0 +1,6 @@
+import com.intellij.openapi.components.Service;
+
+@Service
+final strictfp
+class MyService {
+}

plugins/devkit/devkit-java-tests/testData/inspections/lightServiceMustBeFinal/MakeFinal_after.java

@@ -1,6 +1,5 @@
 import com.intellij.openapi.components.Service;
 
 @Service
-final
-class MyService {
+final class MyService {
 }

plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/LightServiceMustBeFinalInspectionTest.kt

@@ -14,7 +14,7 @@ internal class LightServiceMustBeFinalInspectionTest : LightServiceMustBeFinalIn
 
   override fun getFileExtension() = "java"
 
-  fun testMakeFinal() {
-    doTest(MAKE_FINAL_FIX_NAME)
-  }
+  fun testMakeFinal() { doTest(MAKE_FINAL_FIX_NAME) }
+
+  fun testMakeFinalMultiLineModifierList() { doTest(MAKE_FINAL_FIX_NAME) }
 }