Fix indentation with new line before return type

pinterest · Dec 1, 2019 · 55542a7 · 55542a7
1 parent 375509f
commit 55542a7
Show file tree

Hide file tree

Showing 2 changed files with 43 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
@@ -582,6 +582,10 @@ class IndentationRule : Rule("indent"), Rule.Modifier.RestrictToRootLast {
                                         //        value
                                         // }
                                         adjustExpectedIndentAfterArrow(n, ctx)
+                                    prevLeaf?.elementType == COLON ->
+                                        // fun fn():
+                                        //     Int
+                                        adjustExpectedIndentAfterColon(n, ctx)
                                 }
                                 visitWhiteSpace(n, autoCorrect, emit, editorConfig)
                                 if (ctx.localAdj != 0) {
@@ -727,6 +731,12 @@ class IndentationRule : Rule("indent"), Rule.Modifier.RestrictToRootLast {
         }
     }
 
+    private fun adjustExpectedIndentAfterColon(n: ASTNode, ctx: IndentContext) {
+        expectedIndent++
+        debug { "++after(COLON) -> $expectedIndent" }
+        ctx.exitAdjBy(n.treeParent, -1)
+    }
+
     private fun indentStringTemplate(
         node: ASTNode,
         autoCorrect: Boolean,

diff --git a/...rimental/src/test/kotlin/com/pinterest/ktlint/ruleset/experimental/IndentationRuleTest.kt b/...rimental/src/test/kotlin/com/pinterest/ktlint/ruleset/experimental/IndentationRuleTest.kt
@@ -344,4 +344,37 @@ class IndentationRuleTest {
             )
         )
     }
+
+    @Test
+    fun `lint indentation new line before return type`() {
+        assertThat(
+            IndentationRule().lint(
+                """
+                abstract fun doPerformSomeOperation(param: ALongParameter):
+                    SomeLongInterface<ALongParameter.InnerClass, SomeOtherClass>
+                val s: 
+                    String = ""
+                fun process(
+                    fileName: 
+                        String
+                ): List<Output>
+                """.trimIndent()
+            )
+        ).isEmpty()
+    }
+
+    @Test
+    fun `format indentation new line before return type`() {
+        val code = """
+            abstract fun doPerformSomeOperation(param: ALongParameter):
+                SomeLongInterface<ALongParameter.InnerClass, SomeOtherClass>
+            val s: 
+                String = ""
+            fun process(
+                fileName: 
+                    String
+            ): List<Output>            
+        """.trimIndent()
+        assertThat(IndentationRule().format(code)).isEqualTo(code)
+    }
 }