jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-18 00:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix parameter handling in "Move suspicious reference into parentheses"

Browse Source 
Related to KT-21743
This commit is contained in:
Mikhail Glukhikh
2018-03-21 09:53:38 +03:00
parent fbd06dc74f
commit b739db3c35
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
idea/src/org/jetbrains/kotlin/idea/inspections/MoveSuspiciousCallableReferenceIntoParenthesesInspection.kt
View File

@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.builtins.isBuiltinFunctionalTypeOrSubtype
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
import org.jetbrains.kotlin.idea.intentions.ConvertLambdaToReferenceIntention
import org.jetbrains.kotlin.idea.intentions.getCallableDescriptor
import org.jetbrains.kotlin.psi.KtCallableReferenceExpression
@@ -67,12 +68,16 @@ class MoveSuspiciousCallableReferenceIntoParenthesesInspection : AbstractKotlinI
""
} else {
val descriptor = receiverExpression.getCallableDescriptor()
if (descriptor == null || descriptor is ValueParameterDescriptor)
val literal = element.functionLiteral
if (descriptor == null ||
descriptor is ValueParameterDescriptor && descriptor.containingDeclaration == literal.resolveToDescriptorIfAny()
) {
callableReference.resolveToCall(BodyResolveMode.FULL)
?.let { it.extensionReceiver ?: it.dispatchReceiver }
?.let { "${it.type}" } ?: ""
else
} else {
receiverExpression.text
}
}
return "$receiver::${callableReference.text}"
}

6
idea/testData/inspectionsLocal/moveSuspiciousCallableReferenceIntoParentheses/parameterOuter.kt vendored Normal file
View File

@@ -0,0 +1,6 @@
// FIX: Move suspicious callable reference into parentheses '()'
// WITH_RUNTIME
fun foo(bar: Int) {
listOf(1,2,3).map {<caret> bar::plus }
}

6
idea/testData/inspectionsLocal/moveSuspiciousCallableReferenceIntoParentheses/parameterOuter.kt.after vendored Normal file
View File

@@ -0,0 +1,6 @@
// FIX: Move suspicious callable reference into parentheses '()'
// WITH_RUNTIME
fun foo(bar: Int) {
listOf(1,2,3).map(bar::plus)
}

6
idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java generated
View File

@@ -2361,6 +2361,12 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
doTest(fileName);
}
@TestMetadata("parameterOuter.kt")
public void testParameterOuter() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/moveSuspiciousCallableReferenceIntoParentheses/parameterOuter.kt");
doTest(fileName);
}
@TestMetadata("variableReceiver.kt")
public void testVariableReceiver() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/moveSuspiciousCallableReferenceIntoParentheses/variableReceiver.kt");