Extract Java specific check from common method out

This is needed for further refactoring
JetBrains · Apr 14, 2020 · 04223f5 · 04223f5
1 parent cf90fe8
commit 04223f5
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/...r/frontend.java/src/org/jetbrains/kotlin/load/java/sam/JavaSingleAbstractMethodUtils.java b/...r/frontend.java/src/org/jetbrains/kotlin/load/java/sam/JavaSingleAbstractMethodUtils.java
@@ -195,7 +195,12 @@ private static <F extends FunctionDescriptor> SamAdapterDescriptor<F> initSamAda
             @NotNull SamConversionResolver samResolver,
             @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();
         assert returnTypeUnsubstituted != null : "Creating SAM adapter for not initialized original: " + original;
@@ -248,10 +253,6 @@ private static TypeParameters recreateAndInitializeTypeParameters(
             @NotNull List<TypeParameterDescriptor> originalParameters,
             @Nullable DeclarationDescriptor newOwner
     ) {
-        if (newOwner instanceof SamAdapterClassConstructorDescriptor) {
-            return new TypeParameters(originalParameters, TypeSubstitutor.EMPTY);
-        }
-
         Map<TypeParameterDescriptor, TypeParameterDescriptorImpl> traitToFunTypeParameters =
                 JavaResolverUtils.recreateTypeParametersAndReturnMapping(originalParameters, newOwner);
         TypeSubstitutor typeParametersSubstitutor = JavaResolverUtils.createSubstitutorForTypeParameters(traitToFunTypeParameters);