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

Support new suspend convention in frontend

Browse Source 
#KT-14924 In Progress
This commit is contained in:
Denis Zharkov
2016-11-24 15:18:44 +03:00
parent e4a383f3e2
commit a34c9c2580
26 changed files with 168 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ScopeTowerProcessors.kt
+4 -12
View File
@@ -21,9 +21,9 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.VariableDescriptor
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind
import org.jetbrains.kotlin.resolve.coroutine.CoroutineReceiverValue
import org.jetbrains.kotlin.resolve.coroutine.createCoroutineSuspensionFunctionView
import org.jetbrains.kotlin.resolve.scopes.receivers.*
import org.jetbrains.kotlin.resolve.scopes.receivers.DetailedReceiver
import org.jetbrains.kotlin.resolve.scopes.receivers.QualifierReceiver
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValueWithSmartCastInfo
import org.jetbrains.kotlin.utils.addToStdlib.check
@@ -109,14 +109,6 @@ private class NoExplicitReceiverScopeTowerProcessor<D : CallableDescriptor, C: C
result.add(
candidateFactory.createCandidate(
it, ExplicitReceiverKind.NO_EXPLICIT_RECEIVER, extensionReceiver = data.implicitReceiver))
if (data.implicitReceiver.receiverValue is CoroutineReceiverValue) {
val newDescriptor = it.descriptor.createCoroutineSuspensionFunctionView() ?: return@forEach
result.add(
candidateFactory.createCandidate(
it.copy(newDescriptor = newDescriptor),
ExplicitReceiverKind.NO_EXPLICIT_RECEIVER, extensionReceiver = data.implicitReceiver))
}
}
result
@@ -204,4 +196,4 @@ fun <D : CallableDescriptor, C: Candidate<D>> createProcessorWithReceiverValueOr
else {
create(explicitReceiver as ReceiverValueWithSmartCastInfo?)
}
}
}
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerLevels.kt
+4 -10
View File
@@ -24,14 +24,15 @@ import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.calls.smartcasts.getReceiverValueWithSmartCast
import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForObject
import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForTypeAliasObject
import org.jetbrains.kotlin.resolve.coroutine.CoroutineReceiverValue
import org.jetbrains.kotlin.resolve.coroutine.createCoroutineSuspensionFunctionView
import org.jetbrains.kotlin.resolve.descriptorUtil.HIDES_MEMBERS_NAME_LIST
import org.jetbrains.kotlin.resolve.descriptorUtil.hasClassValueDescriptor
import org.jetbrains.kotlin.resolve.descriptorUtil.hasHidesMembersAnnotation
import org.jetbrains.kotlin.resolve.descriptorUtil.hasLowPriorityInOverloadResolution
import org.jetbrains.kotlin.resolve.scopes.*
import org.jetbrains.kotlin.resolve.scopes.receivers.*
import org.jetbrains.kotlin.resolve.scopes.receivers.CastImplicitClassReceiver
import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitClassReceiver
import org.jetbrains.kotlin.resolve.scopes.receivers.QualifierReceiver
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValueWithSmartCastInfo
import org.jetbrains.kotlin.resolve.scopes.utils.collectFunctions
import org.jetbrains.kotlin.resolve.scopes.utils.collectVariables
import org.jetbrains.kotlin.resolve.selectMostSpecificInEachOverridableGroup
@@ -118,13 +119,6 @@ internal class ReceiverScopeTowerLevel(
}
}
if (receiverValue is CoroutineReceiverValue) {
result.addAll(result.mapNotNull {
val suspensionFunctionView = it.descriptor.createCoroutineSuspensionFunctionView() ?: return@mapNotNull null
createCandidateDescriptor(suspensionFunctionView, dispatchReceiver)
})
}
return result
}
compiler/resolution/src/org/jetbrains/kotlin/resolve/coroutine/coroutineUtil.kt
-30
View File
@@ -17,37 +17,7 @@
package org.jetbrains.kotlin.resolve.coroutine
import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver
import org.jetbrains.kotlin.types.KotlinType
val SUSPENSION_POINT_KEY: FunctionDescriptor.UserDataKey<Boolean> = object : FunctionDescriptor.UserDataKey<Boolean> {}
val REPLACED_SUSPENSION_POINT_KEY: FunctionDescriptor.UserDataKey<Boolean> = object : FunctionDescriptor.UserDataKey<Boolean> {}
// Returns suspension function as it's visible within coroutines:
// E.g. `fun <V> await(f: CompletableFuture<V>): V` instead of `fun <V> await(f: CompletableFuture<V>, machine: Continuation<V>): Unit`
fun <D : CallableDescriptor> D.createCoroutineSuspensionFunctionView(): D? {
if (this !is SimpleFunctionDescriptor) return null
if (!isSuspend) return null
val returnType = getSuspensionPointReturnType() ?: return null
val newOriginal =
if (original !== this)
original.createCoroutineSuspensionFunctionView()
else null
@Suppress("UNCHECKED_CAST")
return newCopyBuilder().apply {
setReturnType(returnType)
setOriginal(newOriginal)
setValueParameters(valueParameters.subList(0, valueParameters.size - 1))
setSignatureChange()
setPreserveSourceElement()
putUserData(SUSPENSION_POINT_KEY, true)
}.build()!! as D
}
fun SimpleFunctionDescriptor.getSuspensionPointReturnType(): KotlinType? = valueParameters.lastOrNull()?.returnType?.arguments?.getOrNull(0)?.type
class CoroutineReceiverValue(callableDescriptor: CallableDescriptor, receiverType: KotlinType) : ExtensionReceiver(callableDescriptor, receiverType)