Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix false positive when empty parameter list is in between trailing lambda's of a nested call expression #2891

Merged
merged 1 commit into from
Dec 3, 2024
Merged

Fix false positive when empty parameter list is in between trailing lambda's of a nested call expression #2891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions ...pinterest/ktlint/ruleset/standard/rules/UnnecessaryParenthesesBeforeTrailingLambdaRule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package com.pinterest.ktlint.ruleset.standard.rules

import com.pinterest.ktlint.rule.engine.core.api.AutocorrectDecision
import com.pinterest.ktlint.rule.engine.core.api.ElementType.CALL_EXPRESSION
import com.pinterest.ktlint.rule.engine.core.api.ElementType.FUNCTION_LITERAL
import com.pinterest.ktlint.rule.engine.core.api.ElementType.LAMBDA_ARGUMENT
import com.pinterest.ktlint.rule.engine.core.api.ElementType.LAMBDA_EXPRESSION
import com.pinterest.ktlint.rule.engine.core.api.ElementType.LPAR
import com.pinterest.ktlint.rule.engine.core.api.ElementType.RPAR
import com.pinterest.ktlint.rule.engine.core.api.ElementType.VALUE_ARGUMENT_LIST
Expand All @@ -14,6 +16,7 @@ import com.pinterest.ktlint.rule.engine.core.api.children
import com.pinterest.ktlint.rule.engine.core.api.ifAutocorrectAllowed
import com.pinterest.ktlint.rule.engine.core.api.isPartOf
import com.pinterest.ktlint.rule.engine.core.api.nextCodeSibling
import com.pinterest.ktlint.rule.engine.core.api.prevCodeSibling
import com.pinterest.ktlint.ruleset.standard.StandardRule
import org.jetbrains.kotlin.com.intellij.lang.ASTNode

Expand All @@ -27,8 +30,9 @@ public class UnnecessaryParenthesesBeforeTrailingLambdaRule : StandardRule("unne
node: ASTNode,
emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> AutocorrectDecision,
) {
if (node.isPartOf(CALL_EXPRESSION) &&
node.isEmptyArgumentList() &&
if (node.isEmptyArgumentList() &&
node.isPartOf(CALL_EXPRESSION) &&
node.isNotPrecededByCallExpressionEndingWithLambdaArgument() &&
node.nextCodeSibling()?.elementType == LAMBDA_ARGUMENT
) {
emit(
Expand All @@ -46,6 +50,17 @@ public class UnnecessaryParenthesesBeforeTrailingLambdaRule : StandardRule("unne
children()
.filterNot { it.elementType == LPAR || it.elementType == RPAR }
.none()

private fun ASTNode.isNotPrecededByCallExpressionEndingWithLambdaArgument() =
prevCodeSibling()
?.takeIf { it.elementType == CALL_EXPRESSION }
?.lastChildNode
?.takeIf { it.elementType == LAMBDA_ARGUMENT }
?.lastChildNode
?.takeIf { it.elementType == LAMBDA_EXPRESSION }
?.lastChildNode
?.let { it.elementType != FUNCTION_LITERAL }
?: true
}

public val UNNECESSARY_PARENTHESES_BEFORE_TRAILING_LAMBDA_RULE_ID: RuleId = UnnecessaryParenthesesBeforeTrailingLambdaRule().ruleId
11 changes: 11 additions & 0 deletions ...erest/ktlint/ruleset/standard/rules/UnnecessaryParenthesesBeforeTrailingLambdaRuleTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,15 @@ class UnnecessaryParenthesesBeforeTrailingLambdaRuleTest {
.hasLintViolation(2, 24, "Empty parentheses in function call followed by lambda are unnecessary")
.isFormattedAs(formattedCode)
}

@Test
fun `Issue 2884 - Given some a call expression ending with a lambda argument, followed by an empty argument list followed by another lambda argument then do not remove empty parameter list`() {
val code =
"""
fun fooBar(foo: () -> String): (() -> String) -> String = { bar -> foo().plus(" ").plus(bar()) }

val foobar = fooBar { "Hello" }() { "world" }
""".trimIndent()
unnecessaryParenthesesBeforeTrailingLambdaRuleAssertThat(code).hasNoLintViolations()
}
}
Loading