From 8b918e12b250b070c65f69404d0f7ddd302fb3b6 Mon Sep 17 00:00:00 2001 From: Nikolay Lunyak Date: Tue, 7 Sep 2021 20:38:30 +0300 Subject: [PATCH] [FIR] Simplify FirPropertyFieldDeclarationChecker --- .../FirPropertyFieldDeclarationChecker.kt | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPropertyFieldDeclarationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPropertyFieldDeclarationChecker.kt index 80bbbb0da6e..fa9cb915ddd 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPropertyFieldDeclarationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPropertyFieldDeclarationChecker.kt @@ -38,12 +38,12 @@ object FirPropertyFieldTypeChecker : FirPropertyChecker() { reporter.reportOn(backingField.source, FirErrors.PROPERTY_FIELD_DECLARATION_MISSING_INITIALIZER, context) } - if (backingField.isSubtypeOf(declaration, typeCheckerContext)) { - checkAsPropertyNotSubtype(declaration, context, reporter) - } else if (declaration.isSubtypeOf(backingField, typeCheckerContext)) { + if (!backingField.isSubtypeOf(declaration, typeCheckerContext)) { 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) } } - - private fun checkAsIndependentTypes( - property: FirProperty, - context: CheckerContext, - reporter: DiagnosticReporter - ) { - checkAsPropertyNotSubtype(property, context, reporter) - checkAsFieldNotSubtype(property, context, reporter) - } }