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

Added validation that all non-trait classes have at least one supertype.

Browse Source 
Fixed it for some class objects.
This commit is contained in:
Evgeny Gerashchenko
2013-12-20 21:37:35 +04:00
parent 4329c42e3f
commit e3743ace4f
6 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java
+9 -1
View File
@@ -23,6 +23,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import java.io.PrintStream;
import java.util.Arrays;
@@ -222,7 +223,14 @@ public class DescriptorValidator {
ClassDescriptor descriptor, DiagnosticCollector collector
) {
validateTypeParameters(collector, descriptor.getTypeConstructor().getParameters());
validateTypes(descriptor, collector, descriptor.getTypeConstructor().getSupertypes());
Collection<JetType> supertypes = descriptor.getTypeConstructor().getSupertypes();
if (supertypes.isEmpty() && descriptor.getKind() != ClassKind.TRAIT
&& KotlinBuiltIns.getInstance().getAny() != descriptor
&& KotlinBuiltIns.getInstance().getNothing() != descriptor) {
report(collector, descriptor, "No supertypes for non-trait");
}
validateTypes(descriptor, collector, supertypes);
validateType(descriptor, descriptor.getDefaultType(), collector);