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

[FE] Use DescriptorFactory.createContextReceiverParameterForCallable

Browse Source
This commit is contained in:
Anastasiya Shadrina
2021-11-22 18:57:48 +07:00
committed by TeamCityServer
parent 13c8531f3a
commit 2954c5cc9c
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java
+4 -7
View File
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.annotations.Annotations;
import org.jetbrains.kotlin.descriptors.annotations.AnnotationsKt; import org.jetbrains.kotlin.descriptors.annotations.AnnotationsKt;
import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.resolve.DescriptorFactory;
import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver; import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver;
import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.*;
import org.jetbrains.kotlin.utils.SmartList; import org.jetbrains.kotlin.utils.SmartList;
@@ -632,13 +633,9 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
if (substitutedContextReceiverType == null) { if (substitutedContextReceiverType == null) {
return null; return null;
} }
ReceiverParameterDescriptor substitutedContextReceiverParameter = new ReceiverParameterDescriptorImpl( ReceiverParameterDescriptor substitutedContextReceiverParameter =
substitutedDescriptor, DescriptorFactory.createContextReceiverParameterForCallable(substitutedDescriptor, substitutedContextReceiverType,
new ExtensionReceiver( newContextReceiverParameter.getAnnotations());
substitutedDescriptor, substitutedContextReceiverType, newContextReceiverParameter.getValue()
),
newContextReceiverParameter.getAnnotations()
);
substitutedContextReceiverParameters.add(substitutedContextReceiverParameter); substitutedContextReceiverParameters.add(substitutedContextReceiverParameter);
wereChanges[0] |= substitutedContextReceiverType != newContextReceiverParameter.getType(); wereChanges[0] |= substitutedContextReceiverType != newContextReceiverParameter.getType();