From 8bb16d8e7a2f7934ee56c2f32c4778c00c2937e2 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Thu, 2 Sep 2021 16:27:26 +0300
Subject: [PATCH] FIR opt-in: rename(s) in checker(s)

---
 .../checkers/expression/FirOptInAnnotationCallChecker.kt  | 8 ++++----
 .../checkers/expression/FirOptInUsageBaseChecker.kt       | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInAnnotationCallChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInAnnotationCallChecker.kt
index d19c602f4c6..e1547a29eb5 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInAnnotationCallChecker.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInAnnotationCallChecker.kt
@@ -25,10 +25,10 @@ object FirOptInAnnotationCallChecker : FirAnnotationCallChecker() {
     override fun check(expression: FirAnnotationCall, context: CheckerContext, reporter: DiagnosticReporter) {
         val lookupTag = expression.annotationTypeRef.coneTypeSafe<ConeClassLikeType>()?.lookupTag ?: return
         val classId = lookupTag.classId
-        val isMarker = classId == OptInNames.REQUIRES_OPT_IN_CLASS_ID
+        val isRequiresOptIn = classId == OptInNames.REQUIRES_OPT_IN_CLASS_ID
         val isOptIn = classId == OptInNames.OPT_IN_CLASS_ID
-        if (isMarker || isOptIn) {
-            checkUsageOfKotlinExperimentalOrUseExperimental(expression.source, context, reporter)
+        if (isRequiresOptIn || isOptIn) {
+            checkOptInIsEnabled(expression.source, context, reporter)
             if (isOptIn) {
                 val arguments = expression.arguments
                 if (arguments.isEmpty()) {
@@ -52,7 +52,7 @@ object FirOptInAnnotationCallChecker : FirAnnotationCallChecker() {
         }
     }
 
-    private fun checkUsageOfKotlinExperimentalOrUseExperimental(
+    private fun checkOptInIsEnabled(
         element: FirSourceElement?,
         context: CheckerContext,
         reporter: DiagnosticReporter
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageBaseChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageBaseChecker.kt
index 2225dcffea7..ee9e5c78677 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageBaseChecker.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInUsageBaseChecker.kt
@@ -221,10 +221,10 @@ object FirOptInUsageBaseChecker {
     }
 
     private fun FirAnnotationContainer.isExperimentalityAcceptable(annotationClassId: ClassId): Boolean {
-        return getAnnotationByClassId(annotationClassId) != null || isAnnotatedWithUseExperimentalOf(annotationClassId)
+        return getAnnotationByClassId(annotationClassId) != null || isAnnotatedWithOptIn(annotationClassId)
     }
 
-    private fun FirAnnotationContainer.isAnnotatedWithUseExperimentalOf(annotationClassId: ClassId): Boolean {
+    private fun FirAnnotationContainer.isAnnotatedWithOptIn(annotationClassId: ClassId): Boolean {
         for (annotation in annotations) {
             val coneType = annotation.annotationTypeRef.coneType as? ConeClassLikeType
             if (coneType?.lookupTag?.classId != OptInNames.OPT_IN_CLASS_ID) {