Minor. Add covariant override for TypeParameterDescriptor.original

This commit is contained in:
Denis Zharkov
2016-09-12 16:32:11 +03:00
parent 3471b3311f
commit 15c0901a72
3 changed files with 11 additions and 1 deletions
@@ -671,7 +671,7 @@ class TypeResolver(
fromIndex: Int, fromIndex: Int,
constructorParameters: List<TypeParameterDescriptor> constructorParameters: List<TypeParameterDescriptor>
) = constructorParameters.subList(fromIndex, constructorParameters.size).map { ) = constructorParameters.subList(fromIndex, constructorParameters.size).map {
TypeProjectionImpl((it.original as TypeParameterDescriptor).defaultType) TypeProjectionImpl(it.original.defaultType)
} }
fun resolveTypeProjections( fun resolveTypeProjections(
@@ -42,6 +42,10 @@ public interface TypeParameterDescriptor extends ClassifierDescriptor {
@Deprecated // Use the static method DescriptorSubstitutor.substituteTypeParameters() @Deprecated // Use the static method DescriptorSubstitutor.substituteTypeParameters()
TypeParameterDescriptor substitute(@NotNull TypeSubstitutor substitutor); TypeParameterDescriptor substitute(@NotNull TypeSubstitutor substitutor);
@NotNull
@Override
TypeParameterDescriptor getOriginal();
int getIndex(); int getIndex();
/** /**
@@ -128,6 +128,12 @@ public abstract class AbstractTypeParameterDescriptor extends DeclarationDescrip
return defaultType.invoke(); return defaultType.invoke();
} }
@NotNull
@Override
public TypeParameterDescriptor getOriginal() {
return (TypeParameterDescriptor) super.getOriginal();
}
@NotNull @NotNull
@Override @Override
@Deprecated @Deprecated