AutoFormat bug with method parameter alignment when using tabs (#3724)

* Test case reproducing autoformat bug for continuation indents and constructor arguments * Properly calculate indentation when using tabs * Fix off-by-1-error --------- Co-authored-by: Knut Wannheden <[email protected]>
openrewrite · Nov 22, 2023 · a9ab03f · a9ab03f
1 parent 775c2d5
commit a9ab03f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
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
@@ -173,6 +173,27 @@ private void firstArgOnNewLine(
         );
     }
 
+    @Test
+    void alignMethodDeclarationParamsWhenContinuationIndentUsingTabs() {
+        rewriteRun(
+          tabsAndIndents(style -> style.withUseTabCharacter(true)),
+          java(
+            """
+            import java.util.*;
+            
+            class Foo {
+            	Foo(
+            			String var1,
+            			String var2,
+            			String var3
+            	) {
+            	}
+            }
+            """
+          )
+        );
+    }
+
     // https://rules.sonarsource.com/java/tag/confusing/RSPEC-3973
     @DocumentExample
     @SuppressWarnings("SuspiciousIndentAfterControlStatement")

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
@@ -235,7 +235,7 @@ public <T> JRightPadded<T> visitRightPadded(@Nullable JRightPadded<T> right, JRi
                             if (method != null) {
                                 int alignTo;
                                 if (firstArg.getPrefix().getLastWhitespace().contains("\n")) {
-                                    alignTo = firstArg.getPrefix().getLastWhitespace().length() - 1;
+                                    alignTo = getLengthOfWhitespace(firstArg.getPrefix().getLastWhitespace());
                                 } else {
                                     String source = method.print(getCursor());
                                     int firstArgIndex = source.indexOf(firstArg.print(getCursor()));