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

Check of type parameter bounds consistency #KT-9438 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-10-19 12:13:35 +03:00
parent 73176fae17
commit 3151d4ca9d
9 changed files with 166 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+2
View File
@@ -182,6 +182,8 @@ public interface Errors {
DiagnosticFactory0<KtTypeReference> SUPERTYPE_APPEARS_TWICE = DiagnosticFactory0.create(ERROR);
DiagnosticFactory3<KtDelegationSpecifierList, TypeParameterDescriptor, ClassDescriptor, Collection<KtType>>
INCONSISTENT_TYPE_PARAMETER_VALUES = DiagnosticFactory3.create(ERROR);
DiagnosticFactory3<KtTypeParameter, TypeParameterDescriptor, ClassDescriptor, Collection<KtType>>
INCONSISTENT_TYPE_PARAMETER_BOUNDS = DiagnosticFactory3.create(ERROR);
DiagnosticFactory0<KtTypeReference> FINAL_SUPERTYPE = DiagnosticFactory0.create(ERROR);
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
+1
View File
@@ -524,6 +524,7 @@ public class DefaultErrorMessages {
MAP.put(UNCHECKED_CAST, "Unchecked cast: {0} to {1}", RENDER_TYPE, RENDER_TYPE);
MAP.put(INCONSISTENT_TYPE_PARAMETER_VALUES, "Type parameter {0} of ''{1}'' has inconsistent values: {2}", NAME, NAME, RENDER_COLLECTION_OF_TYPES);
MAP.put(INCONSISTENT_TYPE_PARAMETER_BOUNDS, "Type parameter {0} of ''{1}'' has inconsistent bounds: {2}", NAME, NAME, RENDER_COLLECTION_OF_TYPES);
MAP.put(EQUALITY_NOT_APPLICABLE, "Operator ''{0}'' cannot be applied to ''{1}'' and ''{2}''", new Renderer<KtSimpleNameExpression>() {
@NotNull
compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java
+38 -12
View File
@@ -74,7 +74,7 @@ public class DeclarationsChecker {
KtClassOrObject classOrObject = entry.getKey();
ClassDescriptorWithResolutionScopes classDescriptor = entry.getValue();
checkSupertypesForConsistency(classDescriptor);
checkSupertypesForConsistency(classOrObject, classDescriptor);
checkTypesInClassHeader(classOrObject);
if (classOrObject instanceof KtClass) {
@@ -184,9 +184,26 @@ public class DeclarationsChecker {
}
}
private void checkSupertypesForConsistency(@NotNull ClassDescriptor classDescriptor) {
Multimap<TypeConstructor, TypeProjection> multimap = SubstitutionUtils
.buildDeepSubstitutionMultimap(classDescriptor.getDefaultType());
private void checkSupertypesForConsistency(
@NotNull KtClassOrObject classOrObject,
@NotNull ClassDescriptor classDescriptor
) {
checkSupertypesForConsistency(classDescriptor, classOrObject);
}
private void checkSupertypesForConsistency(
@NotNull KtTypeParameter typeParameter,
@NotNull TypeParameterDescriptor typeParameterDescriptor
) {
checkSupertypesForConsistency(typeParameterDescriptor, typeParameter);
}
private void checkSupertypesForConsistency(
@NotNull ClassifierDescriptor classifierDescriptor,
@NotNull PsiElement sourceElement
) {
Multimap<TypeConstructor, TypeProjection> multimap =
SubstitutionUtils.buildDeepSubstitutionMultimap(classifierDescriptor.getDefaultType());
for (Map.Entry<TypeConstructor, Collection<TypeProjection>> entry : multimap.asMap().entrySet()) {
Collection<TypeProjection> projections = entry.getValue();
if (projections.size() > 1) {
@@ -204,14 +221,19 @@ public class DeclarationsChecker {
if (conflictingTypes.size() > 1) {
DeclarationDescriptor containingDeclaration = typeParameterDescriptor.getContainingDeclaration();
assert containingDeclaration instanceof ClassDescriptor : containingDeclaration;
KtClassOrObject psiElement = (KtClassOrObject) DescriptorToSourceUtils.getSourceFromDescriptor(classDescriptor);
assert psiElement != null;
KtDelegationSpecifierList delegationSpecifierList = psiElement.getDelegationSpecifierList();
assert delegationSpecifierList != null;
// trace.getErrorHandler().genericError(delegationSpecifierList.getNode(), "Type parameter " + typeParameterDescriptor.getName() + " of " + containingDeclaration.getName() + " has inconsistent values: " + conflictingTypes);
trace.report(INCONSISTENT_TYPE_PARAMETER_VALUES
.on(delegationSpecifierList, typeParameterDescriptor, (ClassDescriptor) containingDeclaration,
conflictingTypes));
if (sourceElement instanceof KtClassOrObject) {
KtDelegationSpecifierList delegationSpecifierList = ((KtClassOrObject) sourceElement).getDelegationSpecifierList();
assert delegationSpecifierList != null;
// trace.getErrorHandler().genericError(delegationSpecifierList.getNode(), "Type parameter " + typeParameterDescriptor.getName() + " of " + containingDeclaration.getName() + " has inconsistent values: " + conflictingTypes);
trace.report(INCONSISTENT_TYPE_PARAMETER_VALUES
.on(delegationSpecifierList, typeParameterDescriptor, (ClassDescriptor) containingDeclaration,
conflictingTypes));
}
else if (sourceElement instanceof KtTypeParameter) {
trace.report(INCONSISTENT_TYPE_PARAMETER_BOUNDS
.on((KtTypeParameter) sourceElement, typeParameterDescriptor, (ClassDescriptor) containingDeclaration,
conflictingTypes));
}
}
}
}
@@ -362,6 +384,10 @@ public class DeclarationsChecker {
if (typeParameter.getExtendsBound() != null && hasConstraints(typeParameter, constraints)) {
trace.report(MISPLACED_TYPE_PARAMETER_CONSTRAINTS.on(typeParameter));
}
TypeParameterDescriptor descriptor = trace.get(TYPE_PARAMETER, typeParameter);
if (descriptor != null) {
checkSupertypesForConsistency(typeParameter, descriptor);
}
}
}
}