From 836881243250f2ff821d3ae7569cb5d484dc08c4 Mon Sep 17 00:00:00 2001
From: Jinseong Jeon <jsjeon@google.com>
Date: Thu, 4 Mar 2021 09:57:38 -0800
Subject: [PATCH] Minor cleanup: avoid vague util names

---
 .../declaration/FirDeclarationCheckerUtils.kt    | 16 ++--------------
 .../declaration/FirMemberPropertiesChecker.kt    |  3 ++-
 .../declaration/FirTopLevelPropertiesChecker.kt  |  3 ++-
 3 files changed, 6 insertions(+), 16 deletions(-)

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 0f9675f86cc..f0d7843fbe3 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 f057cd66020..aec533f8db6 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 9336451ecd6..e94428b17d6 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)
     }
 }