Ignore function which is returned as result in a function body (#2526)

Closes #2521
pinterest · Feb 3, 2024 · 4c5c305 · 4c5c305
1 parent 9ab5f9e
commit 4c5c305
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/...main/kotlin/com/pinterest/ktlint/ruleset/standard/rules/BlankLineBeforeDeclarationRule.kt b/...main/kotlin/com/pinterest/ktlint/ruleset/standard/rules/BlankLineBeforeDeclarationRule.kt
@@ -12,6 +12,7 @@ import com.pinterest.ktlint.rule.engine.core.api.ElementType.OBJECT_DECLARATION
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.OBJECT_LITERAL
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.PROPERTY
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.PROPERTY_ACCESSOR
+import com.pinterest.ktlint.rule.engine.core.api.ElementType.RETURN_KEYWORD
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.WHEN
 import com.pinterest.ktlint.rule.engine.core.api.Rule
 import com.pinterest.ktlint.rule.engine.core.api.RuleId
@@ -120,7 +121,9 @@ public class BlankLineBeforeDeclarationRule :
  return
  }
 
- if (node.elementType == FUN && node.prevCodeSibling()?.elementType == EQ) {
+ if (node.elementType == FUN &&
+ (node.prevCodeSibling()?.elementType == EQ || node.prevCodeSibling()?.elementType == RETURN_KEYWORD)
+ ) {
  // Allow:
  // val foo =
  // fun(): String {

diff --git a/.../kotlin/com/pinterest/ktlint/ruleset/standard/rules/BlankLineBeforeDeclarationRuleTest.kt b/.../kotlin/com/pinterest/ktlint/ruleset/standard/rules/BlankLineBeforeDeclarationRuleTest.kt
@@ -493,4 +493,17 @@ class BlankLineBeforeDeclarationRuleTest {
  """.trimIndent()
  blankLineBeforeDeclarationRuleAssertThat(code).hasNoLintViolations()
  }
+
+ @Test
+ fun `Issue 2521 - Given a function returning a function in a block body`() {
+ val code =
+ """
+ fun foo(bar: Int): (Int) -> Int {
+ return fun(baz: Int): Int {
+ return bar + baz
+ }
+ }
+ """.trimIndent()
+ blankLineBeforeDeclarationRuleAssertThat(code).hasNoLintViolations()
+ }
 }