Fix indentation of annotation parameters

openrewrite · Oct 15, 2023 · 7907471 · 7907471
1 parent b2cd021
commit 7907471
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/org/openrewrite/kotlin/format/TabsAndIndentsVisitor.java b/src/main/java/org/openrewrite/kotlin/format/TabsAndIndentsVisitor.java
@@ -113,7 +113,8 @@ public J preVisit(@Nullable J tree, P p) {
                 tree instanceof J.ClassDeclaration ||
                 tree instanceof K.ClassDeclaration ||
                 (tree instanceof J.FieldAccess || tree instanceof J.MethodInvocation)
-                        && !wrappingStyle.getChainedFunctionCalls().getUseContinuationIndent()
+                        && !wrappingStyle.getChainedFunctionCalls().getUseContinuationIndent() ||
+                tree instanceof J.Annotation
         ) {
             getCursor().putMessage("indentType", IndentType.INDENT);
         } else if (tree instanceof K.ExpressionStatement ||

diff --git a/src/test/java/org/openrewrite/kotlin/format/TabsAndIndentsTest.java b/src/test/java/org/openrewrite/kotlin/format/TabsAndIndentsTest.java
@@ -309,8 +309,8 @@ void annotationArguments() {
             """
               class Test {
                   @Suppress(
-                          "unchecked",
-                          "ALL"
+                      "unchecked",
+                      "ALL"
                   )
                   val id: String = "1"
               }
@@ -1074,7 +1074,7 @@ annotation class Anno
                             
               class Test {
                   @Suppress(
-                          "unchecked"
+                      "unchecked"
                   )
                   @Anno
                   var id: Int = 0
@@ -1519,8 +1519,8 @@ void twoThrows() {
 
               class Test {
                   @Throws(
-                          IOException::class,
-                          Exception::class)
+                      IOException::class,
+                      Exception::class)
                   fun method() {
                   }