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

if then to elvis: support calling extension function in class #KT-26343 Fixed

Browse Source
This commit is contained in:
Toshiaki Kameyama
2018-08-24 19:42:55 +09:00
committed by Mikhail Glukhikh
parent b34f32d4f3
commit 8f80851b9a
4 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt
+6 -1
View File
@@ -43,6 +43,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.calls.callUtil.getType
import org.jetbrains.kotlin.resolve.calls.resolvedCallUtil.getExplicitReceiverValue
import org.jetbrains.kotlin.resolve.calls.resolvedCallUtil.getImplicitReceiverValue
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory
@@ -229,7 +230,11 @@ data class IfThenToSelectData(
}
}
internal fun getImplicitReceiver(): ImplicitReceiver? = baseClause.getResolvedCall(context)?.getImplicitReceiverValue()
internal fun getImplicitReceiver(): ImplicitReceiver? {
val resolvedCall = baseClause.getResolvedCall(context) ?: return null
if (resolvedCall.getExplicitReceiverValue() != null) return null
return resolvedCall.getImplicitReceiverValue()
}
internal fun hasImplicitReceiver(): Boolean = getImplicitReceiver() != null