KT-4960 Redeclaration is not reported for type parameters of interfaces

When resolving a class body for a class without a primary constructor
(e.g., an interface), no checks were performed for redeclarations
in the corresponding class header.
Creating & initializing a lexical scope of an appropriate kind will do it.
Note that since class has no primary constructor, only type parameters
could be redeclared (and that's KT-4960).
This commit is contained in:
Dmitry Petrov
2017-03-28 15:59:33 +03:00
parent eb0c0a8869
commit 5ccfbcbe22
6 changed files with 62 additions and 2 deletions
@@ -268,6 +268,9 @@ public class BodyResolver {
primaryConstructor == null
? null
: FunctionDescriptorUtil.getFunctionInnerScope(scopeForConstructorResolution, primaryConstructor, trace, overloadChecker);
if (primaryConstructor == null) {
checkRedeclarationsInClassHeaderWithoutPrimaryConstructor(descriptor, scopeForConstructorResolution);
}
ExpressionTypingServices typeInferrer = expressionTypingServices; // TODO : flow
Map<KtTypeReference, KotlinType> supertypes = Maps.newLinkedHashMap();
@@ -396,6 +399,25 @@ public class BodyResolver {
checkSupertypeList(descriptor, supertypes, ktClass);
}
private void checkRedeclarationsInClassHeaderWithoutPrimaryConstructor(
@NotNull final ClassDescriptor descriptor, @NotNull LexicalScope scopeForConstructorResolution
) {
// Initializing a scope will report errors if any.
new LexicalScopeImpl(
scopeForConstructorResolution, descriptor, true, null, LexicalScopeKind.CLASS_HEADER,
new TraceBasedLocalRedeclarationChecker(trace, overloadChecker),
new Function1<LexicalScopeImpl.InitializeHandler, Unit>() {
@Override
public Unit invoke(LexicalScopeImpl.InitializeHandler handler) {
// If a class has no primary constructor, it still can have type parameters declared in header.
for (TypeParameterDescriptor typeParameter : descriptor.getDeclaredTypeParameters()) {
handler.addClassifierDescriptor(typeParameter);
}
return Unit.INSTANCE;
}
});
}
private void resolveConstructorCallForEnumEntryWithoutInitializer(
@NotNull KtEnumEntry ktEnumEntry,
@NotNull ClassDescriptor enumEntryDescriptor,