improved Autodetect interpretation of annotations for continuationInd…

…ent. fixes #3568
openrewrite · Sep 27, 2023 · ac6d3f2 · ac6d3f2
1 parent b863972
commit ac6d3f2
Show file tree

Hide file tree

Showing 2 changed files with 128 additions and 2 deletions.
diff --git a/rewrite-java-test/src/test/java/org/openrewrite/java/style/AutodetectTest.java b/rewrite-java-test/src/test/java/org/openrewrite/java/style/AutodetectTest.java
@@ -15,7 +15,9 @@
  */
 package org.openrewrite.java.style;
 
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.ExpectedToFail;
 import org.openrewrite.Issue;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.style.GeneralFormatStyle;
@@ -25,7 +27,7 @@
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@SuppressWarnings({"ConstantConditions", "ResultOfMethodCallIgnored"})
+@SuppressWarnings({"ConstantConditions", "ResultOfMethodCallIgnored", "PointlessBooleanExpression"})
 class AutodetectTest implements RewriteTest {
 
     private static JavaParser jp() {
@@ -1045,4 +1047,122 @@ public void cont() {
         assertThat(tabsAndIndents.getIndentSize()).isEqualTo(4);
         assertThat(tabsAndIndents.getContinuationIndent()).isEqualTo(12);
     }
+
+    @Nested
+    class ContinuationIndentForAnnotations {
+        @Test
+        @Issue("https://github.com/openrewrite/rewrite/issues/3568")
+        void ignoreSpaceBetweenAnnotations() {
+            var cus = jp().parse(
+              """
+                class Test {
+                    @SafeVarargs
+                    @Deprecated
+                    @SuppressWarnings({"mistakes"})
+                    boolean count(String... strings) {
+                        return strings.length;
+                    }
+                }
+                """
+            );
+
+            var detector = Autodetect.detector();
+            cus.forEach(detector::sample);
+            var styles = detector.build();
+            var tabsAndIndents = NamedStyles.merge(TabsAndIndentsStyle.class, singletonList(styles));
+
+            assertThat(tabsAndIndents.getIndentSize()).isEqualTo(4);
+            assertThat(tabsAndIndents.getContinuationIndent())
+              .as("With no actual continuation indents to go off of, assume IntelliJ IDEA default of 2x the normal indent")
+              .isEqualTo(8);
+        }
+
+        @Test
+        void includeAnnotationAsAnnotationArg() {
+            var cus = jp().parse(
+              """
+                @interface Foo{}
+                @interface Foos{
+                    Foo[] value();
+                }
+                
+                class Test {
+                    @Foos(
+                       @Foo)
+                    boolean count(String... strings) {
+                        return strings.length;
+                    }
+                }
+                """
+            );
+
+            var detector = Autodetect.detector();
+            cus.forEach(detector::sample);
+            var styles = detector.build();
+            var tabsAndIndents = NamedStyles.merge(TabsAndIndentsStyle.class, singletonList(styles));
+
+            assertThat(tabsAndIndents.getIndentSize()).isEqualTo(4);
+            assertThat(tabsAndIndents.getContinuationIndent())
+              .isEqualTo(3);
+        }
+
+        @Test
+        void includeAnnotationArgArray() {
+            var cus = jp().parse(
+              """
+                @interface Foo{}
+                @interface Foos{
+                    Foo[] value();
+                }
+                
+                class Test {
+                    @Foos(
+                       {@Foo})
+                    boolean count(String... strings) {
+                        return strings.length;
+                    }
+                }
+                """
+            );
+
+            var detector = Autodetect.detector();
+            cus.forEach(detector::sample);
+            var styles = detector.build();
+            var tabsAndIndents = NamedStyles.merge(TabsAndIndentsStyle.class, singletonList(styles));
+
+            assertThat(tabsAndIndents.getIndentSize()).isEqualTo(4);
+            assertThat(tabsAndIndents.getContinuationIndent())
+              .isEqualTo(3);
+        }
+
+        @Test
+        @ExpectedToFail("existing visitor does not super-visit newArray trees")
+        void includeAnnotationArgArrayElements() {
+            var cus = jp().parse(
+              """
+                @interface Foo{}
+                @interface Foos{
+                    Foo[] value();
+                }
+                
+                class Test {
+                    @Foos({
+                       @Foo})
+                    boolean count(String... strings) {
+                        return strings.length;
+                    }
+                }
+                """
+            );
+
+            var detector = Autodetect.detector();
+            cus.forEach(detector::sample);
+            var styles = detector.build();
+            var tabsAndIndents = NamedStyles.merge(TabsAndIndentsStyle.class, singletonList(styles));
+
+            assertThat(tabsAndIndents.getIndentSize()).isEqualTo(4);
+            assertThat(tabsAndIndents.getContinuationIndent())
+              .isEqualTo(3);
+        }
+    }
 }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/style/Autodetect.java b/rewrite-java/src/main/java/org/openrewrite/java/style/Autodetect.java
@@ -418,7 +418,13 @@ public Expression visitExpression(Expression expression, IndentStatistics stats)
             if (statementExpressions.contains(expression)) {
                 return expression;
             }
-            countIndents(expression.getPrefix().getWhitespace(), true, stats);
+            // (newline-separated) annotations on some common target are not continuations
+            boolean isContinuation = !(expression instanceof J.Annotation && !(
+                    // ...but annotations which are *arguments* to other annotations can be continuations
+                    getCursor().getParentTreeCursor().getValue() instanceof J.Annotation
+                    || getCursor().getParentTreeCursor().getValue() instanceof J.NewArray
+            ));
+            countIndents(expression.getPrefix().getWhitespace(), isContinuation, stats);
 
             return expression;
         }