Formatter: Fix method parameter alignment bug (#3612)

The multi-line method parameter alignment which was introduced in #1920 caused excessive indentation when the declaring method had annotations.
openrewrite · Oct 12, 2023 · c54853f · c54853f
1 parent 572ce98
commit c54853f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/rewrite-java-test/src/test/java/org/openrewrite/java/format/TabsAndIndentsTest.java b/rewrite-java-test/src/test/java/org/openrewrite/java/format/TabsAndIndentsTest.java
@@ -103,9 +103,10 @@ void alignMethodDeclarationParamsWhenMultiple() {
           java(
             """
               class Test {
+                  @SuppressWarnings
                   private void firstArgNoPrefix(String first,
-                                                int times,
-                                                String third
+                          int times,
+                          String third
                        ) {
                   }
                   private void firstArgOnNewLine(
@@ -118,6 +119,7 @@ private void firstArgOnNewLine(
               """,
             """
               class Test {
+                  @SuppressWarnings
                   private void firstArgNoPrefix(String first,
                                                 int times,
                                                 String third

diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/TabsAndIndentsVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/TabsAndIndentsVisitor.java
@@ -227,7 +227,9 @@ public <T> JRightPadded<T> visitRightPadded(@Nullable JRightPadded<T> right, JRi
                                     alignTo = firstArg.getPrefix().getLastWhitespace().length() - 1;
                                 } else {
                                     String source = method.print(getCursor());
-                                    alignTo = source.indexOf(firstArg.print(getCursor())) - 1;
+                                    int firstArgIndex = source.indexOf(firstArg.print(getCursor()));
+                                    int lineBreakIndex = source.lastIndexOf('\n', firstArgIndex);
+                                    alignTo = (firstArgIndex - (lineBreakIndex == -1 ? 0 : lineBreakIndex)) - 1;
                                 }
                                 getCursor().getParentOrThrow().putMessage("lastIndent", alignTo - style.getContinuationIndent());
                                 elem = visitAndCast(elem, p);