[FIR] Simplify FirPropertyFieldDeclarationChecker
This commit is contained in:
committed by
TeamCityServer
parent
30e52186eb
commit
8b918e12b2
+5
-14
@@ -38,12 +38,12 @@ object FirPropertyFieldTypeChecker : FirPropertyChecker() {
|
|||||||
reporter.reportOn(backingField.source, FirErrors.PROPERTY_FIELD_DECLARATION_MISSING_INITIALIZER, context)
|
reporter.reportOn(backingField.source, FirErrors.PROPERTY_FIELD_DECLARATION_MISSING_INITIALIZER, context)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (backingField.isSubtypeOf(declaration, typeCheckerContext)) {
|
if (!backingField.isSubtypeOf(declaration, typeCheckerContext)) {
|
||||||
checkAsPropertyNotSubtype(declaration, context, reporter)
|
|
||||||
} else if (declaration.isSubtypeOf(backingField, typeCheckerContext)) {
|
|
||||||
checkAsFieldNotSubtype(declaration, context, reporter)
|
checkAsFieldNotSubtype(declaration, context, reporter)
|
||||||
} else {
|
}
|
||||||
checkAsIndependentTypes(declaration, context, reporter)
|
|
||||||
|
if (!declaration.isSubtypeOf(backingField, typeCheckerContext)) {
|
||||||
|
checkAsPropertyNotSubtype(declaration, context, reporter)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,13 +69,4 @@ object FirPropertyFieldTypeChecker : FirPropertyChecker() {
|
|||||||
reporter.reportOn(property.source, FirErrors.PROPERTY_MUST_HAVE_GETTER, context)
|
reporter.reportOn(property.source, FirErrors.PROPERTY_MUST_HAVE_GETTER, context)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun checkAsIndependentTypes(
|
|
||||||
property: FirProperty,
|
|
||||||
context: CheckerContext,
|
|
||||||
reporter: DiagnosticReporter
|
|
||||||
) {
|
|
||||||
checkAsPropertyNotSubtype(property, context, reporter)
|
|
||||||
checkAsFieldNotSubtype(property, context, reporter)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user