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

Drop ClassKind.CLASS_OBJECT

Browse Source 
Default and non-default objects now have ClassKind.OBJECT
This commit is contained in:
Pavel V. Talanov
2015-03-04 17:05:28 +03:00
parent f72f548a93
commit ed4c265564
17 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java
+2 -2
View File
@@ -264,8 +264,8 @@ public class DescriptorValidator {
}
ClassDescriptor defaultObjectDescriptor = descriptor.getDefaultObjectDescriptor();
if (defaultObjectDescriptor != null && defaultObjectDescriptor.getKind() != ClassKind.CLASS_OBJECT) {
report(collector, defaultObjectDescriptor, "Default object should be of kind " + ClassKind.CLASS_OBJECT);
if (defaultObjectDescriptor != null && !defaultObjectDescriptor.isDefaultObject()) {
report(collector, defaultObjectDescriptor, "Default object should be marked as such");
}
return true;