Improve diagnostics for lateinit properties with generic type

#KT-11834 Fixed
2017-09-05 14:32:20 +03:00
parent 356f903645
commit 081b732070
3 changed files with 13 additions and 1 deletions
@@ -45,9 +45,12 @@ object LateinitModifierApplicabilityChecker {
            trace.report(Errors.INAPPLICABLE_LATEINIT_MODIFIER.on(modifier, "is allowed only on mutable $variables"))
        }

-        if (TypeUtils.isNullableType(type)) {
+        if (type.isMarkedNullable) {
            trace.report(Errors.INAPPLICABLE_LATEINIT_MODIFIER.on(modifier, "is not allowed on $variables of nullable types"))
        }
+        else if (TypeUtils.isNullableType(type)) {
+            trace.report(Errors.INAPPLICABLE_LATEINIT_MODIFIER.on(modifier, "is not allowed on $variables of a type with nullable upper bound"))
+        }

        if (KotlinBuiltIns.isPrimitiveType(type)) {
            trace.report(Errors.INAPPLICABLE_LATEINIT_MODIFIER.on(modifier, "is not allowed on $variables of primitive types"))