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

Fix type of callable reference to fake override

Browse Source
This commit is contained in:
Alexander Udalov
2015-10-14 17:29:26 +03:00
parent 9eb2e16b94
commit 2cf437c0e2
4 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/callableReferences/CallableReferencesResolutionUtils.kt
+7 -2
View File
@@ -205,8 +205,13 @@ private fun createReflectionTypeForCallableDescriptor(
trace: BindingTrace?,
reportOn: JetExpression?
): JetType? {
val extensionReceiver = descriptor.getExtensionReceiverParameter()
val dispatchReceiver = descriptor.getDispatchReceiverParameter()
val extensionReceiver = descriptor.extensionReceiverParameter
val dispatchReceiver = descriptor.dispatchReceiverParameter?.let { dispatchReceiver ->
// See CallableDescriptor#getOwnerForEffectiveDispatchReceiverParameter
if ((descriptor as? CallableMemberDescriptor)?.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE)
DescriptorUtils.getDispatchReceiverParameterIfNeeded(descriptor.containingDeclaration)
else dispatchReceiver
}
if (extensionReceiver != null && dispatchReceiver != null && descriptor is CallableMemberDescriptor) {
if (reportOn != null) {