Fixing bug with extra indentation after lambda arrow

Fixes pinterest#479
shashachu · Jul 3, 2019 · 532f03c · 532f03c
1 parent 0fef759
commit 532f03c
Showing 1 changed file with 8 additions and 5 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
@@ -707,11 +707,14 @@ class IndentationRule : Rule("indent"), Rule.Modifier.RestrictToRootLast {
     }
 
     private fun adjustExpectedIndentAfterArrow(n: ASTNode, ctx: IndentContext) {
-        val prevBlockLine = ctx.blockOpeningLineStack.peek() ?: -1
-        if (prevBlockLine != line) {
-            expectedIndent++
-            debug { "++after(ARROW) -> $expectedIndent" }
-            ctx.exitAdjBy(n.treeParent, -1)
+        // Only adjust indents for arrows inside of when statements. Lambda arrows should not increase indent.
+        if (n.treeParent?.elementType == WHEN_ENTRY) {
+            val prevBlockLine = ctx.blockOpeningLineStack.peek() ?: -1
+            if (prevBlockLine != line) {
+                expectedIndent++
+                debug { "++after(ARROW) -> $expectedIndent" }
+                ctx.exitAdjBy(n.treeParent, -1)
+            }
         }
     }