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

KNPE fixed in data class checker together with some ID warnings #KT-9296 Fixed #EA-73584 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-09-25 11:34:44 +03:00
parent bd7ccc0138
commit f06a79d534
4 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/DataClassAnnotationChecker.kt
+3 -3
View File
@@ -33,13 +33,13 @@ public class DataClassAnnotationChecker : DeclarationChecker {
if (declaration !is JetClassOrObject) return
if (KotlinBuiltIns.isData(descriptor)) {
if (descriptor.getUnsubstitutedPrimaryConstructor() == null && descriptor.getConstructors().isNotEmpty()) {
diagnosticHolder.report(Errors.PRIMARY_CONSTRUCTOR_REQUIRED_FOR_DATA_CLASS.on(declaration.getNameIdentifier()));
if (descriptor.unsubstitutedPrimaryConstructor == null && descriptor.constructors.isNotEmpty()) {
declaration.nameIdentifier?.let { diagnosticHolder.report(Errors.PRIMARY_CONSTRUCTOR_REQUIRED_FOR_DATA_CLASS.on(it)) }
}
val primaryConstructor = declaration.getPrimaryConstructor()
val parameters = primaryConstructor?.valueParameters ?: emptyList()
if (parameters.isEmpty()) {
diagnosticHolder.report(Errors.DATA_CLASS_WITHOUT_PARAMETERS.on(declaration.nameIdentifier!!))
declaration.nameIdentifier?.let { diagnosticHolder.report(Errors.DATA_CLASS_WITHOUT_PARAMETERS.on(it)) }
}
for (parameter in parameters) {
if (parameter.isVarArg) {