Refactoring: type parameters are explicitly built on the call site, not in the constructor
This commit is contained in:
committed by
Alexander Udalov
parent
077cd62e1b
commit
37707e51a2
+6
-2
@@ -80,7 +80,7 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements
|
||||
this.deserializer = DescriptorDeserializer.create(typeDeserializer, this, nameResolver, annotationResolver);
|
||||
|
||||
this.containingDeclaration = containingDeclaration;
|
||||
this.typeConstructor = new DeserializedClassTypeConstructor();
|
||||
this.typeConstructor = new DeserializedClassTypeConstructor(deserializer.typeParameters(classProto.getTypeParametersList()));
|
||||
this.memberScope = new DeserializedClassMemberScope(this);
|
||||
this.innerClassesScope = new InnerClassesScopeWrapper(memberScope);
|
||||
this.thisAsReceiverParameter = new LazyClassReceiverParameterDescriptor();
|
||||
@@ -276,7 +276,11 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements
|
||||
|
||||
private class DeserializedClassTypeConstructor implements TypeConstructor {
|
||||
private final Collection<JetType> supertypes = computeSuperTypes();
|
||||
private final List<TypeParameterDescriptor> parameters = deserializer.typeParameters(classProto.getTypeParametersList());
|
||||
private final List<TypeParameterDescriptor> parameters;
|
||||
|
||||
public DeserializedClassTypeConstructor(@NotNull List<TypeParameterDescriptor> typeParameters) {
|
||||
parameters = typeParameters;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user