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

Use original type parameters for SAM adapter to constructor

Browse Source 
It makes SAM descriptors more consistent with real ones
This commit is contained in:
Denis Zharkov
2015-11-03 14:02:30 +03:00
parent d614adcd2a
commit 7b4c0fb83a
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java
+4
View File
@@ -289,6 +289,10 @@ public class SingleAbstractMethodUtils {
@NotNull List<TypeParameterDescriptor> originalParameters, @NotNull List<TypeParameterDescriptor> originalParameters,
@Nullable DeclarationDescriptor newOwner @Nullable DeclarationDescriptor newOwner
) { ) {
if (newOwner instanceof SamAdapterConstructorDescriptor) {
return new TypeParameters(originalParameters, TypeSubstitutor.EMPTY);
}
Map<TypeParameterDescriptor, TypeParameterDescriptorImpl> traitToFunTypeParameters = Map<TypeParameterDescriptor, TypeParameterDescriptorImpl> traitToFunTypeParameters =
JavaResolverUtils.recreateTypeParametersAndReturnMapping(originalParameters, newOwner); JavaResolverUtils.recreateTypeParametersAndReturnMapping(originalParameters, newOwner);
TypeSubstitutor typeParametersSubstitutor = JavaResolverUtils.createSubstitutorForTypeParameters(traitToFunTypeParameters); TypeSubstitutor typeParametersSubstitutor = JavaResolverUtils.createSubstitutorForTypeParameters(traitToFunTypeParameters);