Retain whitespace before annotations in NoFinalizedLocalVariables

Fixes #431
openrewrite · Jan 7, 2025 · dfdb3eb · dfdb3eb
1 parent 9d252a1
commit dfdb3eb
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/main/java/org/openrewrite/staticanalysis/NoFinalizedLocalVariables.java b/src/main/java/org/openrewrite/staticanalysis/NoFinalizedLocalVariables.java
@@ -78,7 +78,7 @@ private J.VariableDeclarations removeFinal(J.VariableDeclarations mv) {
                         m -> m.getType() == J.Modifier.Type.Final ? null : m));
                 if (v.getModifiers().isEmpty() && v.getTypeExpression() != null) {
                     v = v.withTypeExpression(v.getTypeExpression().withPrefix(v.getTypeExpression().getPrefix()
-                            .withWhitespace("")));
+                            .withWhitespace(v.getLeadingAnnotations().isEmpty() ? "" : " ")));
                 }
                 return v;
             }

diff --git a/src/test/java/org/openrewrite/staticanalysis/NoFinalizedLocalVariablesTest.java b/src/test/java/org/openrewrite/staticanalysis/NoFinalizedLocalVariablesTest.java
@@ -69,4 +69,25 @@ public String get() {
           )
         );
     }
+
+    @Test
+    void retainPrefix() {
+        rewriteRun(
+          //language=java
+          java(
+            """
+              class T {
+                  public void test(@SuppressWarnings final String s) {
+                  }
+              }
+              """,
+            """
+              class T {
+                  public void test(@SuppressWarnings String s) {
+                  }
+              }
+              """
+          )
+        );
+    }
 }