Prepare chopping and wrapping parameters in methodDeclarations. (#6129)

Author: Jenson3210

rewrite-java-test/src/test/java/org/openrewrite/java/format/TabsAndIndentsTest.java

@@ -175,6 +175,42 @@ private void firstArgOnNewLine(
         );
     }
 
+    @Test
+    void alignMethodDeclarationParamsWhenIndentationNeeded() {
+        rewriteRun(
+          java(
+            """
+              class Test {
+                  @SuppressWarnings
+                  private void firstArgNoPrefix(
+              String first,
+               int times,
+              String third) {}
+                  private void secondArgOnNewLine(
+              String first,
+                              int times,
+                     String third
+                  ) {}
+              }
+              """,
+            """
+              class Test {
+                  @SuppressWarnings
+                  private void firstArgNoPrefix(
+                          String first,
+                          int times,
+                          String third) {}
+                  private void secondArgOnNewLine(
+                          String first,
+                          int times,
+                          String third
+                  ) {}
+              }
+              """
+          )
+        );
+    }
+
     @Issue("https://github.com/openrewrite/rewrite/issues/1913")
     @Test
     void alignMethodDeclarationParamsWhenContinuationIndent() {

rewrite-java/src/main/java/org/openrewrite/java/format/TabsAndIndentsVisitor.java

@@ -397,7 +397,13 @@ private int computeFirstParameterColumn(J.MethodDeclaration method) {
         }
 
         if (firstArg.getPrefix().getLastWhitespace().contains("\n")) {
-            return getLengthOfWhitespace(firstArg.getPrefix().getLastWhitespace());
+            int declPrefixLength = getLengthOfWhitespace(method.getPrefix().getLastWhitespace());
+            int argPrefixLength = getLengthOfWhitespace(firstArg.getPrefix().getLastWhitespace());
+            //noinspection ConstantConditions to be backwards compatible with older style versions
+            if (declPrefixLength >= argPrefixLength) {
+                return declPrefixLength + style.getContinuationIndent();
+            }
+            return argPrefixLength;
         } else {
             return computeColumnPosition(method, firstArg, getCursor());
         }