Fix indentation with lambda argument, Fix #622 (#627)

* Fix indentation with lambda * Add test for format
pinterest · Nov 5, 2019 · b41aa22 · b41aa22
1 parent 2e7d67c
commit b41aa22
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 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
@@ -616,7 +616,7 @@ class IndentationRule : Rule("indent"), Rule.Modifier.RestrictToRootLast {
     }
 
     private fun adjustExpectedIndentInsideQualifiedExpression(n: ASTNode, ctx: IndentContext) {
-        val p = n.treeParent
+        val p = n.parent({ it.treeParent.elementType != DOT_QUALIFIED_EXPRESSION }) ?: return
         val nextSibling = n.treeNext
         if (!ctx.ignored.contains(p) && nextSibling != null) {
             expectedIndent++
@@ -631,7 +631,8 @@ class IndentationRule : Rule("indent"), Rule.Modifier.RestrictToRootLast {
             } else {
                 nextSibling
             }
-            ctx.exitAdjBy(e, -1)
+            ctx.ignored.add(p)
+            ctx.exitAdjBy(p, -1)
         }
     }
 

diff --git a/ktlint-ruleset-experimental/src/test/resources/spec/indent/format-expected.kt.spec b/ktlint-ruleset-experimental/src/test/resources/spec/indent/format-expected.kt.spec
@@ -42,6 +42,13 @@ public class ThisIsASampleClass :
         }
     }
 
+    fun foo3() {
+        Integer
+            .parseInt("32").let {
+                println("parsed $it")
+            }
+    }
+
     private val f =
         { a: Int -> a * 2 }
 

diff --git a/ktlint-ruleset-experimental/src/test/resources/spec/indent/format.kt.spec b/ktlint-ruleset-experimental/src/test/resources/spec/indent/format.kt.spec
@@ -42,6 +42,13 @@ return 2
 }
 }
 
+fun foo3() {
+Integer
+.parseInt("32").let {
+println("parsed $it")
+}
+}
+
 private val f =
 { a: Int -> a * 2 }
 

diff --git a/ktlint-ruleset-experimental/src/test/resources/spec/indent/lint-string.kt.spec b/ktlint-ruleset-experimental/src/test/resources/spec/indent/lint-string.kt.spec
@@ -19,4 +19,11 @@ fun f4() = "${
 true
 }"
 
+fun f5() {
+    Integer
+        .parseInt("32").let {
+            println("parsed $it")
+        }
+}
+
 // expect