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

Extract Java specific check from common method out

Browse Source 
This is needed for further refactoring
This commit is contained in:
Mikhail Zarechenskiy
2020-04-09 00:57:34 +03:00
parent cf90fe81ac
commit 04223f5711
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/JavaSingleAbstractMethodUtils.java
+6 -5
View File
@@ -195,7 +195,12 @@ public class JavaSingleAbstractMethodUtils {
@NotNull SamConversionResolver samResolver, @NotNull SamConversionResolver samResolver,
@NotNull SamConversionOracle samConversionOracle @NotNull SamConversionOracle samConversionOracle
) { ) {
TypeParameters typeParameters = recreateAndInitializeTypeParameters(original.getTypeParameters(), adapter); TypeParameters typeParameters;
if (adapter instanceof SamAdapterClassConstructorDescriptor) {
typeParameters = new TypeParameters(original.getTypeParameters(), TypeSubstitutor.EMPTY);
} else {
typeParameters = recreateAndInitializeTypeParameters(original.getTypeParameters(), adapter);
}
KotlinType returnTypeUnsubstituted = original.getReturnType(); KotlinType returnTypeUnsubstituted = original.getReturnType();
assert returnTypeUnsubstituted != null : "Creating SAM adapter for not initialized original: " + original; assert returnTypeUnsubstituted != null : "Creating SAM adapter for not initialized original: " + original;
@@ -248,10 +253,6 @@ public class JavaSingleAbstractMethodUtils {
@NotNull List<TypeParameterDescriptor> originalParameters, @NotNull List<TypeParameterDescriptor> originalParameters,
@Nullable DeclarationDescriptor newOwner @Nullable DeclarationDescriptor newOwner
) { ) {
if (newOwner instanceof SamAdapterClassConstructorDescriptor) {
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);