diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDeclarationCheckerUtils.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDeclarationCheckerUtils.kt index 0f9675f86cc9d3f1bef518778d6f00a8638bd165..f0d7843fbe33faa4e0e633c090cb30be4a35b878 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDeclarationCheckerUtils.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDeclarationCheckerUtils.kt @@ -75,19 +75,7 @@ internal fun checkExpectDeclarationVisibilityAndBody( } } -internal fun checkProperty( - containingClass: FirRegularClass?, - property: FirProperty, - modifierList: FirModifierList?, - isInitialized: Boolean, - reporter: DiagnosticReporter, - context: CheckerContext -) { - checkPropertyInitializer(containingClass, property, modifierList, isInitialized, reporter, context) - checkPropertyAccessors(property, reporter, context) -} - -private fun checkPropertyInitializer( +internal fun checkPropertyInitializer( containingClass: FirRegularClass?, property: FirProperty, modifierList: FirModifierList?, @@ -166,7 +154,7 @@ private fun checkPropertyInitializer( } } -private fun checkPropertyAccessors( +internal fun checkPropertyAccessors( property: FirProperty, reporter: DiagnosticReporter, context: CheckerContext diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberPropertiesChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberPropertiesChecker.kt index f057cd66020fe94f2fce20c63d18383990d0efb7..aec533f8db6ae77c461e0f484a3cdb4b094ed004 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberPropertiesChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMemberPropertiesChecker.kt @@ -148,7 +148,8 @@ object FirMemberPropertiesChecker : FirRegularClassChecker() { // So, our source of truth should be the full modifier list retrieved from the source. val modifierList = with(FirModifierList) { property.source.getModifierList() } - checkProperty(containingDeclaration, property, modifierList, isInitialized, reporter, context) + checkPropertyInitializer(containingDeclaration, property, modifierList, isInitialized, reporter, context) + checkPropertyAccessors(property, reporter, context) checkExpectDeclarationVisibilityAndBody(property, source, reporter, context) val hasAbstractModifier = modifierList?.modifiers?.any { it.token == KtTokens.ABSTRACT_KEYWORD } == true diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertiesChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertiesChecker.kt index 9336451ecd6a6fa831d743fc3873a38ecd582a61..e94428b17d68d6b0e63ed3aa270b613d7542e23c 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertiesChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertiesChecker.kt @@ -28,7 +28,8 @@ object FirTopLevelPropertiesChecker : FirFileChecker() { // So, our source of truth should be the full modifier list retrieved from the source. val modifierList = with(FirModifierList) { source.getModifierList() } - checkProperty(null, property, modifierList, property.initializer != null, reporter, context) + checkPropertyInitializer(null, property, modifierList, property.initializer != null, reporter, context) + checkPropertyAccessors(property, reporter, context) checkExpectDeclarationVisibilityAndBody(property, source, reporter, context) } }