[FE] Add getContextReceivers to CallableDescriptor interface
This commit is contained in:
committed by
TeamCityServer
parent
7de8380ddf
commit
a39fbd3822
+2
-2
@@ -16,6 +16,7 @@
|
||||
|
||||
package org.jetbrains.kotlin.load.java.sam;
|
||||
|
||||
import kotlin.collections.CollectionsKt;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.kotlin.descriptors.*;
|
||||
import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl;
|
||||
@@ -75,8 +76,7 @@ public class JavaSingleAbstractMethodUtils {
|
||||
@NotNull KotlinType returnType
|
||||
) {
|
||||
result.initialize(
|
||||
null,
|
||||
original.getDispatchReceiverParameter(),
|
||||
null, original.getDispatchReceiverParameter(), CollectionsKt.emptyList(),
|
||||
typeParameters,
|
||||
valueParameters,
|
||||
returnType,
|
||||
|
||||
+1
-2
@@ -88,8 +88,7 @@ public class SignaturesPropagationData {
|
||||
false
|
||||
);
|
||||
autoMethodDescriptor.initialize(
|
||||
null,
|
||||
containingClass.getThisAsReceiverParameter(),
|
||||
null, containingClass.getThisAsReceiverParameter(), CollectionsKt.emptyList(),
|
||||
autoTypeParameters,
|
||||
autoValueParameters,
|
||||
autoReturnType,
|
||||
|
||||
+1
-1
@@ -375,7 +375,7 @@ class JavaSyntheticPropertiesScope(
|
||||
val receiverType = typeSubstitutor.safeSubstitute(ownerClass.defaultType, Variance.INVARIANT)
|
||||
descriptor.setType(
|
||||
propertyType, typeParameters, null,
|
||||
DescriptorFactory.createExtensionReceiverParameterForCallable(descriptor, receiverType, Annotations.EMPTY)
|
||||
DescriptorFactory.createExtensionReceiverParameterForCallable(descriptor, receiverType, Annotations.EMPTY), emptyList()
|
||||
)
|
||||
|
||||
val getter = PropertyGetterDescriptorImpl(
|
||||
|
||||
+1
-1
@@ -338,7 +338,7 @@ class SamAdapterFunctionsScope(
|
||||
val visibility = syntheticVisibility(sourceFunction, isUsedForExtension = false)
|
||||
|
||||
descriptor.initialize(
|
||||
null, ownerClass.thisAsReceiverParameter, typeParameters, valueParameters, returnType,
|
||||
null, ownerClass.thisAsReceiverParameter, emptyList(), typeParameters, valueParameters, returnType,
|
||||
Modality.FINAL, visibility
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user