Fix indentation for function types after a newline (pinterest#1022)

paul-dingemans · Dec 23, 2020 · 68e65db · 68e65db
1 parent 3591e61
commit 68e65db
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - EditorConfig generation for `import-ordering` ([#1011](https://github.com/pinterest/ktlint/pull/1011))
 - Internal error (`no-unused-imports`) ([#996](https://github.com/pinterest/ktlint/issues/996))
 - Fix false positive when argument list is after multiline dot-qualified expression (`argument-list-wrapping`) ([#893](https://github.com/pinterest/ktlint/issues/893))
+- Fix indentation for function types after a newline (`indent`) ([#918](https://github.com/pinterest/ktlint/issues/918))
 
 ### Changed
 - Update Gradle shadow plugin to `6.1.0` version

diff --git a/...ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRule.kt b/...ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRule.kt
@@ -23,6 +23,7 @@ import com.pinterest.ktlint.core.ast.ElementType.ELSE
 import com.pinterest.ktlint.core.ast.ElementType.ELVIS
 import com.pinterest.ktlint.core.ast.ElementType.EOL_COMMENT
 import com.pinterest.ktlint.core.ast.ElementType.EQ
+import com.pinterest.ktlint.core.ast.ElementType.FUN
 import com.pinterest.ktlint.core.ast.ElementType.FUNCTION_LITERAL
 import com.pinterest.ktlint.core.ast.ElementType.GT
 import com.pinterest.ktlint.core.ast.ElementType.KDOC
@@ -725,7 +726,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)
+        if (n.isPartOf(FUN)) {
+            val returnType = n.nextCodeSibling()
+            ctx.exitAdjBy(returnType!!, -1)
+        } else {
+            ctx.exitAdjBy(n.treeParent, -1)
+        }
     }
 
     private fun adjustExpectedIndentAfterLparInsideCondition(n: ASTNode, ctx: IndentContext) {

diff --git a/...set-standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRuleTest.kt b/...set-standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRuleTest.kt
@@ -828,4 +828,25 @@ internal class IndentationRuleTest {
             )
         ).isEmpty()
     }
+
+    // https://github.com/pinterest/ktlint/issues/918
+    @Test
+    fun `lint newline after type reference in functions`() {
+        assertThat(
+            IndentationRule().lint(
+                """
+                override fun actionProcessor():
+                    ObservableTransformer<in SomeVeryVeryLongNameOverHereAction, out SomeVeryVeryLongNameOverHereResult> =
+                    ObservableTransformer { actions ->
+                        // ...
+                    }
+
+                fun generateGooooooooooooooooogle():
+                    Gooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooogle {
+                    return Gooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooogle()
+                }
+                """.trimIndent()
+            )
+        ).isEmpty()
+    }
 }