Ignore anonymous function in rule function-naming

Closes #2260
pinterest · Sep 16, 2023 · 71da821 · 71da821
1 parent a38fb6f
commit 71da821
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ### Fixed
 
 * 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)
 
 ### Changed
 

diff --git a/...tandard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/rules/FunctionNamingRule.kt b/...tandard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/rules/FunctionNamingRule.kt
@@ -1,12 +1,15 @@
 package com.pinterest.ktlint.ruleset.standard.rules
 
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.FUN
+import com.pinterest.ktlint.rule.engine.core.api.ElementType.FUN_KEYWORD
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.IDENTIFIER
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.IMPORT_DIRECTIVE
+import com.pinterest.ktlint.rule.engine.core.api.ElementType.VALUE_PARAMETER_LIST
 import com.pinterest.ktlint.rule.engine.core.api.RuleId
 import com.pinterest.ktlint.rule.engine.core.api.SinceKtlint
 import com.pinterest.ktlint.rule.engine.core.api.SinceKtlint.Status.EXPERIMENTAL
 import com.pinterest.ktlint.rule.engine.core.api.SinceKtlint.Status.STABLE
+import com.pinterest.ktlint.rule.engine.core.api.nextCodeSibling
 import com.pinterest.ktlint.ruleset.standard.StandardRule
 import com.pinterest.ktlint.ruleset.standard.rules.internal.regExIgnoringDiacriticsAndStrokesOnLetters
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
@@ -43,7 +46,8 @@ public class FunctionNamingRule : StandardRule("function-naming") {
  ?.takeUnless {
  node.isFactoryMethod() ||
  node.isTestMethod() ||
- node.hasValidFunctionName()
+ node.hasValidFunctionName() ||
+ node.isAnonymousFunction()
  }?.let {
  val identifierOffset =
  node
@@ -76,6 +80,12 @@ public class FunctionNamingRule : StandardRule("function-naming") {
  .orEmpty()
  .matches(VALID_FUNCTION_NAME_REGEXP)
 
+ private fun ASTNode.isAnonymousFunction() =
+ VALUE_PARAMETER_LIST ==
+ findChildByType(FUN_KEYWORD)
+ ?.nextCodeSibling()
+ ?.elementType
+
  private companion object {
  val VALID_FUNCTION_NAME_REGEXP = "[a-z][A-Za-z\\d]*".regExIgnoringDiacriticsAndStrokesOnLetters()
  val VALID_TEST_FUNCTION_NAME_REGEXP = "(`.*`)|([a-z][A-Za-z\\d_]*)".regExIgnoringDiacriticsAndStrokesOnLetters()

diff --git a/...ard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/rules/FunctionNamingRuleTest.kt b/...ard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/rules/FunctionNamingRuleTest.kt
@@ -170,4 +170,16 @@ class FunctionNamingRuleTest {
  """.trimIndent()
  functionNamingRuleAssertThat(code).hasNoLintViolations()
  }
+
+ @Test
+ fun `Issue 2260 - Given an anonymous function in a property assignment`() {
+ val code =
+ """
+ val foo =
+ fun(): String {
+ return "foo"
+ }
+ """.trimIndent()
+ functionNamingRuleAssertThat(code).hasNoLintViolations()
+ }
 }