Java: Improved inspection "Join Declaration And Assignment" - preserve 'final' (IDEA-177132)

java/java-impl/src/com/intellij/codeInspection/JoinDeclarationAndAssignmentJavaInspection.java

@@ -5,7 +5,6 @@ import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.editorActions.DeclarationJoinLinesHandler;
 import com.intellij.openapi.application.WriteAction;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.profile.codeInspection.InspectionProjectProfileManager;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleManager;
@@ -23,6 +22,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.StringJoiner;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
@@ -251,9 +251,7 @@ public class JoinDeclarationAndAssignmentJavaInspection extends AbstractBaseJava
                                                      @NotNull PsiExpression initializerExpression) {
       Project project = elementToReplace.getProject();
       PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
-      PsiAnnotation[] annotations = context.myVariable.getAnnotations();
-      String text = (annotations.length != 0 ? StringUtil.join(annotations, PsiElement::getText, " ") + " " : "") +
-                    context.myVariable.getTypeElement().getText() + " " + context.myName + "=" + initializerExpression.getText() + ";";
+      String text = context.getDeclarationText(initializerExpression);
       PsiStatement statement = factory.createStatementFromText(text, context.myAssignment);
       PsiElement replaced = elementToReplace.replace(statement);
       return CodeStyleManager.getInstance(project).reformat(replaced);
@@ -328,5 +326,18 @@ public class JoinDeclarationAndAssignmentJavaInspection extends AbstractBaseJava
       myIsUpdate = !JavaTokenType.EQ.equals(myAssignment.getOperationTokenType()) ||
                    findNextAssignment(myAssignment.getParent(), myVariable) != null;
     }
+
+    @NotNull
+    private String getDeclarationText(@NotNull PsiExpression initializer) {
+      StringJoiner joiner = new StringJoiner(" ");
+      if (myVariable.hasModifierProperty(PsiModifier.FINAL)) {
+        joiner.add(PsiKeyword.FINAL + ' ');
+      }
+      for (PsiAnnotation annotation : myVariable.getAnnotations()) {
+        joiner.add(annotation.getText() + ' ');
+      }
+      joiner.add(myVariable.getTypeElement().getText() + ' ' + myName + '=' + initializer.getText() + ';');
+      return joiner.toString();
+    }
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/afterFinal.java

@@ -0,0 +1,7 @@
+// "Join declaration and assignment" "GENERIC_ERROR_OR_WARNING"
+class C {
+    int foo() {
+        final int a = 1;
+        return a;
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/afterVar.java

@@ -0,0 +1,7 @@
+// "Join declaration and assignment" "GENERIC_ERROR_OR_WARNING"
+class C {
+    int foo() {
+        var a = 1;
+        return a;
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/beforeFinal.java

@@ -0,0 +1,8 @@
+// "Join declaration and assignment" "GENERIC_ERROR_OR_WARNING"
+class C {
+    int foo() {
+        final int <caret>a;
+        a = 1;
+        return a;
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/joinDeclaration/beforeVar.java

@@ -0,0 +1,8 @@
+// "Join declaration and assignment" "GENERIC_ERROR_OR_WARNING"
+class C {
+    int foo() {
+        var <caret>a = 0;
+        a = 1;
+        return a;
+    }
+}