Do not force blank line before function in right hand side of assignm…

…ent `blank-line-before-declaration` Closes #2260
pinterest · Sep 16, 2023 · 0065813 · 0065813
1 parent 71da821
commit 0065813
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 * Fix ktlint cli parameter `--code-style` [#2238](https://github.com/pinterest/ktlint/pull/2238)
 * Ignore anonymous function in rule `function-naming` [#2260](https://github.com/pinterest/ktlint/issue/2260)
+* Do not force blank line before function in right hand side of assignment `blank-line-before-declaration` [#2260](https://github.com/pinterest/ktlint/issue/2260)
 
 ### Changed
 

diff --git a/...main/kotlin/com/pinterest/ktlint/ruleset/standard/rules/BlankLineBeforeDeclarationRule.kt b/...main/kotlin/com/pinterest/ktlint/ruleset/standard/rules/BlankLineBeforeDeclarationRule.kt
@@ -4,6 +4,7 @@ import com.pinterest.ktlint.rule.engine.core.api.ElementType.BLOCK
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.CLASS
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.CLASS_BODY
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.CLASS_INITIALIZER
+import com.pinterest.ktlint.rule.engine.core.api.ElementType.EQ
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.FUN
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.FUNCTION_LITERAL
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.LBRACE
@@ -116,10 +117,17 @@ public class BlankLineBeforeDeclarationRule :
             return
         }
 
+        if (node.elementType == FUN && node.prevCodeSibling()?.elementType == EQ) {
+            // Allow:
+            //   val foo =
+            //       fun(): String {
+            //           return "foo"
+            //       }
+            return
+        }
+
         node
             .takeIf { it.psi is KtDeclaration }
-//        (node.psi as KtDeclaration)
-//            .node
             ?.takeIf {
                 val prevLeaf = it.prevLeaf()
                 prevLeaf != null && (!prevLeaf.isWhiteSpace() || !prevLeaf.text.startsWith("\n\n"))

diff --git a/.../kotlin/com/pinterest/ktlint/ruleset/standard/rules/BlankLineBeforeDeclarationRuleTest.kt b/.../kotlin/com/pinterest/ktlint/ruleset/standard/rules/BlankLineBeforeDeclarationRuleTest.kt
@@ -447,4 +447,16 @@ class BlankLineBeforeDeclarationRuleTest {
             .hasLintViolation(3, 5, "Expected a blank line for this declaration")
             .isFormattedAs(formattedCode)
     }
+
+    @Test
+    fun `Issue 2260 - Given an anonymous function as right hand side in an assignment`() {
+        val code =
+            """
+            val foo =
+                fun(): String {
+                    return "foo"
+                }
+            """.trimIndent()
+        blankLineBeforeDeclarationRuleAssertThat(code).hasNoLintViolations()
+    }
 }