azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"Add names to call arguments" shouldn't appear when the only argument is a trailing lambda

Browse Source 
Fixes #KT-15501
This commit is contained in:
Kirill Rakhman
2017-01-06 18:50:15 +01:00
committed by Mikhail Glukhikh
parent 44e69d8adc
commit 2b54f1ac72
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/AddNamesToCallArgumentsIntention.kt
+3 -6
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2016 JetBrains s.r.o. * Copyright 2010-2017 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -19,10 +19,7 @@ package org.jetbrains.kotlin.idea.intentions
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import com.intellij.openapi.util.TextRange import com.intellij.openapi.util.TextRange
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.psi.KtCallElement import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.KtLambdaArgument
import org.jetbrains.kotlin.psi.KtPsiFactory
import org.jetbrains.kotlin.psi.KtValueArgument
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch
import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatchStatus import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatchStatus
@@ -35,7 +32,7 @@ class AddNamesToCallArgumentsIntention : SelfTargetingRangeIntention<KtCallEleme
) { ) {
override fun applicabilityRange(element: KtCallElement): TextRange? { override fun applicabilityRange(element: KtCallElement): TextRange? {
val arguments = element.valueArguments val arguments = element.valueArguments
if (arguments.all { it.isNamed() }) return null if (arguments.all { it.isNamed() || it is LambdaArgument }) return null
val resolvedCall = element.getResolvedCall(element.analyze(BodyResolveMode.PARTIAL)) ?: return null val resolvedCall = element.getResolvedCall(element.analyze(BodyResolveMode.PARTIAL)) ?: return null
if (!resolvedCall.resultingDescriptor.hasStableParameterNames()) return null if (!resolvedCall.resultingDescriptor.hasStableParameterNames()) return null
idea/testData/intentions/addNamesToCallArguments/trailingLambda.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
// IS_APPLICABLE: false
fun foo(f: () -> Unit) {}
fun bar() {
<caret>foo {}
}
idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+7 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2016 JetBrains s.r.o. * Copyright 2010-2017 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -473,6 +473,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
doTest(fileName); doTest(fileName);
} }
@TestMetadata("trailingLambda.kt")
public void testTrailingLambda() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNamesToCallArguments/trailingLambda.kt");
doTest(fileName);
}
@TestMetadata("varargMultiple.kt") @TestMetadata("varargMultiple.kt")
public void testVarargMultiple() throws Exception { public void testVarargMultiple() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNamesToCallArguments/varargMultiple.kt"); String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNamesToCallArguments/varargMultiple.kt");