Merge pull request #388 from shashachu/annotation-indent

Include annotations in parameter indentation checks.
pinterest · Apr 22, 2019 · 6d0a06f · 6d0a06f
2 parents 738bd90 + 260a977
commit 6d0a06f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/...experimental/src/main/kotlin/com/pinterest/ktlint/ruleset/experimental/IndentationRule.kt b/...experimental/src/main/kotlin/com/pinterest/ktlint/ruleset/experimental/IndentationRule.kt
@@ -3,6 +3,7 @@ package com.pinterest.ktlint.ruleset.experimental
 import com.pinterest.ktlint.core.EditorConfig
 import com.pinterest.ktlint.core.KtLint
 import com.pinterest.ktlint.core.Rule
+import com.pinterest.ktlint.core.ast.ElementType.ANNOTATION
 import com.pinterest.ktlint.core.ast.ElementType.ARROW
 import com.pinterest.ktlint.core.ast.ElementType.BINARY_EXPRESSION
 import com.pinterest.ktlint.core.ast.ElementType.BINARY_WITH_TYPE
@@ -280,7 +281,7 @@ class IndentationRule : Rule("indent"), Rule.Modifier.RestrictToRootLast {
     ) {
         for (c in node.children()) {
             if (
-                (c.elementType == VALUE_PARAMETER || c.elementType == VALUE_ARGUMENT) &&
+                (c.elementType == VALUE_PARAMETER || c.elementType == VALUE_ARGUMENT || c.elementType == ANNOTATION) &&
                 c.textContains('\n')
             ) {
                 // rearrange

diff --git a/...uleset-experimental/src/test/resources/spec/indent/format-parameter-list-expected.kt.spec b/...uleset-experimental/src/test/resources/spec/indent/format-parameter-list-expected.kt.spec
@@ -17,3 +17,10 @@ class C (
     }
 }
 
+class TestClass(
+    @Id @NotNull
+    @Column(
+        nullable = false
+    )
+    val id: String
+)
diff --git a/ktlint-ruleset-experimental/src/test/resources/spec/indent/format-parameter-list.kt.spec b/ktlint-ruleset-experimental/src/test/resources/spec/indent/format-parameter-list.kt.spec
@@ -9,3 +9,10 @@ class C (val a: Int, val b: Int, val e: (
     }
 }
 
+class TestClass(
+  @Id @NotNull
+         @Column(
+                        nullable = false
+  )
+  val id: String
+)