diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveEmptyParenthesesFromLambdaCallIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveEmptyParenthesesFromLambdaCallIntention.kt index bee3ba3d576..e96cb029865 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveEmptyParenthesesFromLambdaCallIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveEmptyParenthesesFromLambdaCallIntention.kt @@ -44,10 +44,8 @@ class RemoveEmptyParenthesesFromLambdaCallIntention : SelfTargetingRangeIntentio val parent = element.parent as? KtCallExpression ?: return null val singleLambdaArgument = parent.lambdaArguments.singleOrNull() ?: return null if (element.getLineNumber(start = false) != singleLambdaArgument.getLineNumber(start = true)) return null - val prevCall = element.getPrevSiblingIgnoringWhitespaceAndComments() as? KtCallExpression - if (prevCall?.lambdaArguments?.let { it.size > 0 } == true - || prevCall?.valueArguments?.any { it.getArgumentExpression() is KtLambdaExpression } == true) return null - return element.range + element.getPrevSiblingIgnoringWhitespaceAndComments() as? KtCallExpression ?: return element.range + return null } override fun applyTo(element: KtValueArgumentList, editor: Editor?) { diff --git a/idea/testData/intentions/removeEmptyParenthesesFromLambdaCall/afterLambda3.kt b/idea/testData/intentions/removeEmptyParenthesesFromLambdaCall/afterLambda3.kt new file mode 100644 index 00000000000..e8c676c2ef1 --- /dev/null +++ b/idea/testData/intentions/removeEmptyParenthesesFromLambdaCall/afterLambda3.kt @@ -0,0 +1,7 @@ +// IS_APPLICABLE: false + +fun returnFun2(i: Int): (() -> Unit) -> Unit = {} + +fun test22() { + returnFun2(1)() {} +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java index cc8ddb9520d..4809d8e4ac7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java @@ -12532,6 +12532,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest { runTest("idea/testData/intentions/removeEmptyParenthesesFromLambdaCall/afterLambda2.kt"); } + @TestMetadata("afterLambda3.kt") + public void testAfterLambda3() throws Exception { + runTest("idea/testData/intentions/removeEmptyParenthesesFromLambdaCall/afterLambda3.kt"); + } + public void testAllFilesPresentInRemoveEmptyParenthesesFromLambdaCall() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeEmptyParenthesesFromLambdaCall"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true); }