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

Handling implicit receivers in InflowSlicer

Browse Source
This commit is contained in:
Valentin Kipyatkov
2020-04-10 09:18:24 +03:00
parent 90188ef44f
commit b4b58d1d99
5 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
+16 -8
View File
@@ -45,6 +45,7 @@ import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument
import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitReceiver
import org.jetbrains.kotlin.resolve.source.getPsi
import org.jetbrains.kotlin.util.OperatorNameConventions
@@ -164,24 +165,31 @@ class InflowSlicer(
}
private fun processExtensionReceiver(declaration: KtCallableDeclaration, includeOverriders: Boolean) {
fun extractReceiverExpression(refElement: PsiElement): PsiElement? {
return when (refElement) {
fun processReceiver(refElement: PsiElement) {
when (refElement) {
is KtExpression -> {
val resolvedCall = refElement.resolveToCall() ?: return null
//TODO: implicit receiver
val expressionReceiver = resolvedCall.extensionReceiver as? ExpressionReceiver ?: return null
return expressionReceiver.expression
val resolvedCall = refElement.resolveToCall() ?: return
when (val receiver = resolvedCall.extensionReceiver) {
is ExpressionReceiver -> {
receiver.expression.passToProcessorAsValue()
}
is ImplicitReceiver -> {
val callableDeclaration = (receiver.declarationDescriptor as? CallableDescriptor)?.originalSource?.getPsi()
(callableDeclaration as? KtCallableDeclaration)?.receiverTypeReference?.passToProcessor()
}
}
}
else -> {
(refElement.parent as? PsiCall)?.argumentList?.expressions?.getOrNull(0)
(refElement.parent as? PsiCall)?.argumentList?.expressions?.getOrNull(0)?.passToProcessorAsValue()
}
}
}
fun processCall(usageInfo: UsageInfo) {
usageInfo.element?.let {
extractReceiverExpression(it)?.passToProcessorAsValue()
processReceiver(it)
}
}
idea/testData/slicer/inflow/onFunctionReceiverType.kt
Vendored
+9 -2
View File
@@ -7,7 +7,14 @@ import kotlin.jvm.JvmName
fun <caret>Any.extensionFun() {
}
fun foo() {
fun String.foo() {
"".extensionFun()
1.extensionFun()
}
extensionFun()
}
fun main() {
"A".foo()
}
idea/testData/slicer/inflow/onFunctionReceiverType.leafGroups.txt
Vendored
+7 -2
View File
@@ -2,11 +2,16 @@
7 fun <bold>Any</bold>.extensionFun() {
11 <bold>""</bold>.extensionFun()
19 <bold>"A"</bold>.foo()
7 fun <bold>Any</bold>.extensionFun() {
10 fun <bold>String</bold>.foo() {
19 <bold>"A"</bold>.foo()
3 KotlinUtil.extensionFun(<bold>"x"</bold>);
7 fun <bold>Any</bold>.extensionFun() {
3 KotlinUtil.extensionFun(<bold>"x"</bold>);
12 <bold>1</bold>.extensionFun()
13 <bold>1</bold>.extensionFun()
7 fun <bold>Any</bold>.extensionFun() {
12 <bold>1</bold>.extensionFun()
13 <bold>1</bold>.extensionFun()
idea/testData/slicer/inflow/onFunctionReceiverType.nullnessGroups.txt
Vendored
+6 -2
View File
@@ -2,9 +2,13 @@
11 <bold>""</bold>.extensionFun()
7 fun <bold>Any</bold>.extensionFun() {
11 <bold>""</bold>.extensionFun()
12 <bold>1</bold>.extensionFun()
13 <bold>1</bold>.extensionFun()
7 fun <bold>Any</bold>.extensionFun() {
12 <bold>1</bold>.extensionFun()
13 <bold>1</bold>.extensionFun()
19 <bold>"A"</bold>.foo()
7 fun <bold>Any</bold>.extensionFun() {
10 fun <bold>String</bold>.foo() {
19 <bold>"A"</bold>.foo()
[Other Values]
3 KotlinUtil.extensionFun(<bold>"x"</bold>);
idea/testData/slicer/inflow/onFunctionReceiverType.results.txt
Vendored
+3 -1
View File
@@ -1,4 +1,6 @@
7 fun <bold>Any</bold>.extensionFun() {
3 KotlinUtil.extensionFun(<bold>"x"</bold>);
10 fun <bold>String</bold>.foo() {
19 <bold>"A"</bold>.foo()
11 <bold>""</bold>.extensionFun()
12 <bold>1</bold>.extensionFun()
13 <bold>1</bold>.extensionFun()