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

Minor

Browse Source
This commit is contained in:
Valentin Kipyatkov
2020-04-12 23:46:45 +03:00
parent 9624f8afa3
commit bf79c3f279
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt
+13 -15
View File
@@ -177,21 +177,19 @@ class OutflowSlicer(
if (function.isImplicitInvokeFunction()) { if (function.isImplicitInvokeFunction()) {
val receiverPseudoValue = instruction.receiverValues.entries.singleOrNull()?.key val receiverPseudoValue = instruction.receiverValues.entries.singleOrNull()?.key
?: return@processPseudocodeUsages ?: return@processPseudocodeUsages
if (receiverPseudoValue.createdAt != null) { when (val createdAt = receiverPseudoValue.createdAt) {
when (val createdAt = receiverPseudoValue.createdAt) { is ReadValueInstruction -> {
is ReadValueInstruction -> { val accessedDescriptor = createdAt.target.accessedDescriptor ?: return@processPseudocodeUsages
val accessedDescriptor = createdAt.target.accessedDescriptor ?: return@processPseudocodeUsages if (accessedDescriptor is ValueParameterDescriptor) {
if (accessedDescriptor is ValueParameterDescriptor) { val accessedDeclaration = accessedDescriptor.originalSource.getPsi() ?: return@processPseudocodeUsages
val accessedDeclaration = accessedDescriptor.originalSource.getPsi() ?: return@processPseudocodeUsages val isExtension = accessedDescriptor.type.isExtensionFunctionType
val isExtension = accessedDescriptor.type.isExtensionFunctionType val shift = if (isExtension) 1 else 0
val shift = if (isExtension) 1 else 0 val argumentIndex = parameterDescriptor.index - shift
val argumentIndex = parameterDescriptor.index - shift val newMode = if (argumentIndex >= 0)
val newMode = if (argumentIndex >= 0) mode.withBehaviour(LambdaArgumentInflowBehaviour(argumentIndex))
mode.withBehaviour(LambdaArgumentInflowBehaviour(argumentIndex)) else
else mode.withBehaviour(LambdaReceiverInflowBehaviour)
mode.withBehaviour(LambdaReceiverInflowBehaviour) accessedDeclaration.passToProcessor(newMode)
accessedDeclaration.passToProcessor(newMode)
}
} }
} }
} }