Fix indent with get/set and line-separated variable assignment (#599)

pinterest · Oct 3, 2019 · 7f8b89a · 7f8b89a
1 parent dab8b81
commit 7f8b89a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
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
@@ -968,6 +968,16 @@ class IndentationRule : Rule("indent"), Rule.Modifier.RestrictToRootLast {
                 node.treeParent?.elementType.let { it == TYPE_PARAMETER_LIST || it == TYPE_ARGUMENT_LIST } ->
                 0
             nextLeafElementType in rTokenSet -> -1
+            // IDEA quirk:
+            // var value: DataClass =
+            //     DataClass("too long line")
+            //     private set
+            //
+            //  instead of expected:
+            //  var value: DataClass =
+            //      DataClass("too long line")
+            //          private set
+            node.nextCodeSibling()?.elementType == PROPERTY_ACCESSOR && node.treeParent.findChildByType(EQ)?.nextLeaf().isWhiteSpaceWithNewline() -> -1
             else -> 0
         }
         // indentation with all \t replaced

diff --git a/ktlint-ruleset-experimental/src/test/resources/spec/indent/lint-property-accessor.kt.spec b/ktlint-ruleset-experimental/src/test/resources/spec/indent/lint-property-accessor.kt.spec
@@ -28,7 +28,12 @@ class A {
 
     var setterWithAnnotation: Any? = null
         @Inject set
+
+    var multilineInitialValue: String =
+        "tooooooooooooo loooooooooooooooong"
+            private set
 }
 
 // expect
 // 3:1:Unexpected indentation (4) (should be 8)
+// 34:1:Unexpected indentation (12) (should be 8)