[FIR] Cleanup CheckerContext.kt

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/context/CheckerContext.kt

@@ -5,28 +5,26 @@
 
 package org.jetbrains.kotlin.fir.analysis.checkers.context
 
-import kotlinx.collections.immutable.PersistentList
-import kotlinx.collections.immutable.PersistentSet
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.persistentSetOf
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
 import org.jetbrains.kotlin.fir.expressions.FirGetClassCall
 import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccess
 import org.jetbrains.kotlin.fir.resolve.ImplicitReceiverStack
-import org.jetbrains.kotlin.fir.resolve.PersistentImplicitReceiverStack
 import org.jetbrains.kotlin.fir.resolve.SessionHolder
-import org.jetbrains.kotlin.fir.resolve.calls.ImplicitReceiverValue
 import org.jetbrains.kotlin.fir.resolve.transformers.ReturnTypeCalculator
-import org.jetbrains.kotlin.name.Name
 
 abstract class CheckerContext {
+    // Services
+    abstract val sessionHolder: SessionHolder
+    abstract val returnTypeCalculator: ReturnTypeCalculator
+
+    // Context
     abstract val implicitReceiverStack: ImplicitReceiverStack
     abstract val containingDeclarations: List<FirDeclaration>
     abstract val qualifiedAccesses: List<FirQualifiedAccess>
     abstract val getClassCalls: List<FirGetClassCall>
-    abstract val sessionHolder: SessionHolder
+
-    abstract val returnTypeCalculator: ReturnTypeCalculator
+    // Suppress
     abstract val suppressedDiagnostics: Set<String>
     abstract val allInfosSuppressed: Boolean
     abstract val allWarningsSuppressed: Boolean
@@ -35,30 +33,6 @@ abstract class CheckerContext {
     val session: FirSession
         get() = sessionHolder.session
 
-    /**
-     * Returns the closest to the end of context.containingDeclarations
-     * instance of type [T] or null if no such item could be found.
-     */
-    inline fun <reified T : FirDeclaration> findClosest(): T? {
-        for (it in containingDeclarations.asReversed()) {
-            return it as? T ?: continue
-        }
-
-        return null
-    }
-
-    /**
-     * Same as the one without specific [check]. For some cases, an instance of type [T] isn't good enough. E.g., property accessor is
-     * either getter or setter, but a type-based search could return, say, the closest setter, while we want to keep searching for a getter.
-     */
-    inline fun <reified T : FirDeclaration> findClosest(check: (T) -> Boolean): T? {
-        for (it in containingDeclarations.asReversed()) {
-            return (it as? T)?.takeIf(check) ?: continue
-        }
-
-        return null
-    }
-
     abstract fun addSuppressedDiagnostics(
         diagnosticNames: Collection<String>,
         allInfosSuppressed: Boolean,
@@ -67,109 +41,17 @@ abstract class CheckerContext {
     ): PersistentCheckerContext
 }
 
-class PersistentCheckerContext private constructor(
+/**
-    override val implicitReceiverStack: PersistentImplicitReceiverStack,
+ * Returns the closest to the end of context.containingDeclarations instance of type [T] or null if no such item could be found.
-    override val containingDeclarations: PersistentList<FirDeclaration>,
+ * By specifying [check] you can filter which exact declaration should be found
-    override val qualifiedAccesses: PersistentList<FirQualifiedAccess>,
+ * E.g., property accessor is either getter or setter, but a type-based search could return, say,
-    override val getClassCalls: PersistentList<FirGetClassCall>,
+ *   the closest setter, while we want to keep searching for a getter.
-    override val sessionHolder: SessionHolder,
+ */
-    override val returnTypeCalculator: ReturnTypeCalculator,
-    override val suppressedDiagnostics: PersistentSet<String>,
-    override val allInfosSuppressed: Boolean,
-    override val allWarningsSuppressed: Boolean,
-    override val allErrorsSuppressed: Boolean
-) : CheckerContext() {
-    constructor(sessionHolder: SessionHolder, returnTypeCalculator: ReturnTypeCalculator) : this(
-        PersistentImplicitReceiverStack(),
-        persistentListOf(),
-        persistentListOf(),
-        persistentListOf(),
-        sessionHolder,
-        returnTypeCalculator,
-        persistentSetOf(),
-        allInfosSuppressed = false,
-        allWarningsSuppressed = false,
-        allErrorsSuppressed = false
-    )
 
-    fun addImplicitReceiver(name: Name?, value: ImplicitReceiverValue<*>): PersistentCheckerContext {
+inline fun <reified T : FirDeclaration> CheckerContext.findClosest(check: (T) -> Boolean = { true }): T? {
-        return PersistentCheckerContext(
+    for (it in containingDeclarations.asReversed()) {
-            implicitReceiverStack.add(name, value),
+        return (it as? T)?.takeIf(check) ?: continue
-            containingDeclarations,
-            qualifiedAccesses,
-            getClassCalls,
-            sessionHolder,
-            returnTypeCalculator,
-            suppressedDiagnostics,
-            allInfosSuppressed,
-            allWarningsSuppressed,
-            allErrorsSuppressed
-        )
     }
 
-    fun addDeclaration(declaration: FirDeclaration): PersistentCheckerContext {
+    return null
-        return PersistentCheckerContext(
-            implicitReceiverStack,
-            containingDeclarations.add(declaration),
-            qualifiedAccesses,
-            getClassCalls,
-            sessionHolder,
-            returnTypeCalculator,
-            suppressedDiagnostics,
-            allInfosSuppressed,
-            allWarningsSuppressed,
-            allErrorsSuppressed
-        )
-    }
-
-    fun addQualifiedAccess(qualifiedAccess: FirQualifiedAccess): PersistentCheckerContext {
-        return PersistentCheckerContext(
-            implicitReceiverStack,
-            containingDeclarations,
-            qualifiedAccesses.add(qualifiedAccess),
-            getClassCalls,
-            sessionHolder,
-            returnTypeCalculator,
-            suppressedDiagnostics,
-            allInfosSuppressed,
-            allWarningsSuppressed,
-            allErrorsSuppressed
-        )
-    }
-
-    fun addGetClassCall(getClassCall: FirGetClassCall): PersistentCheckerContext {
-        return PersistentCheckerContext(
-            implicitReceiverStack,
-            containingDeclarations,
-            qualifiedAccesses,
-            getClassCalls.add(getClassCall),
-            sessionHolder,
-            returnTypeCalculator,
-            suppressedDiagnostics,
-            allInfosSuppressed,
-            allWarningsSuppressed,
-            allErrorsSuppressed
-        )
-    }
-
-    override fun addSuppressedDiagnostics(
-        diagnosticNames: Collection<String>,
-        allInfosSuppressed: Boolean,
-        allWarningsSuppressed: Boolean,
-        allErrorsSuppressed: Boolean
-    ): PersistentCheckerContext {
-        if (diagnosticNames.isEmpty()) return this
-        return PersistentCheckerContext(
-            implicitReceiverStack,
-            containingDeclarations,
-            qualifiedAccesses,
-            getClassCalls,
-            sessionHolder,
-            returnTypeCalculator,
-            suppressedDiagnostics.addAll(diagnosticNames),
-            this.allInfosSuppressed || allInfosSuppressed,
-            this.allWarningsSuppressed || allWarningsSuppressed,
-            this.allErrorsSuppressed || allErrorsSuppressed
-        )
-    }
 }

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/context/PersistentCheckerContext.kt

@@ -0,0 +1,126 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir.analysis.checkers.context
+
+import kotlinx.collections.immutable.PersistentList
+import kotlinx.collections.immutable.PersistentSet
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentSetOf
+import org.jetbrains.kotlin.fir.declarations.FirDeclaration
+import org.jetbrains.kotlin.fir.expressions.FirGetClassCall
+import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccess
+import org.jetbrains.kotlin.fir.resolve.PersistentImplicitReceiverStack
+import org.jetbrains.kotlin.fir.resolve.SessionHolder
+import org.jetbrains.kotlin.fir.resolve.calls.ImplicitReceiverValue
+import org.jetbrains.kotlin.fir.resolve.transformers.ReturnTypeCalculator
+import org.jetbrains.kotlin.name.Name
+
+class PersistentCheckerContext private constructor(
+    override val implicitReceiverStack: PersistentImplicitReceiverStack,
+    override val containingDeclarations: PersistentList<FirDeclaration>,
+    override val qualifiedAccesses: PersistentList<FirQualifiedAccess>,
+    override val getClassCalls: PersistentList<FirGetClassCall>,
+    override val sessionHolder: SessionHolder,
+    override val returnTypeCalculator: ReturnTypeCalculator,
+    override val suppressedDiagnostics: PersistentSet<String>,
+    override val allInfosSuppressed: Boolean,
+    override val allWarningsSuppressed: Boolean,
+    override val allErrorsSuppressed: Boolean
+) : CheckerContext() {
+    constructor(sessionHolder: SessionHolder, returnTypeCalculator: ReturnTypeCalculator) : this(
+        PersistentImplicitReceiverStack(),
+        persistentListOf(),
+        persistentListOf(),
+        persistentListOf(),
+        sessionHolder,
+        returnTypeCalculator,
+        persistentSetOf(),
+        allInfosSuppressed = false,
+        allWarningsSuppressed = false,
+        allErrorsSuppressed = false
+    )
+
+    fun addImplicitReceiver(name: Name?, value: ImplicitReceiverValue<*>): PersistentCheckerContext {
+        return PersistentCheckerContext(
+            implicitReceiverStack.add(name, value),
+            containingDeclarations,
+            qualifiedAccesses,
+            getClassCalls,
+            sessionHolder,
+            returnTypeCalculator,
+            suppressedDiagnostics,
+            allInfosSuppressed,
+            allWarningsSuppressed,
+            allErrorsSuppressed
+        )
+    }
+
+    fun addDeclaration(declaration: FirDeclaration): PersistentCheckerContext {
+        return PersistentCheckerContext(
+            implicitReceiverStack,
+            containingDeclarations.add(declaration),
+            qualifiedAccesses,
+            getClassCalls,
+            sessionHolder,
+            returnTypeCalculator,
+            suppressedDiagnostics,
+            allInfosSuppressed,
+            allWarningsSuppressed,
+            allErrorsSuppressed
+        )
+    }
+
+    fun addQualifiedAccess(qualifiedAccess: FirQualifiedAccess): PersistentCheckerContext {
+        return PersistentCheckerContext(
+            implicitReceiverStack,
+            containingDeclarations,
+            qualifiedAccesses.add(qualifiedAccess),
+            getClassCalls,
+            sessionHolder,
+            returnTypeCalculator,
+            suppressedDiagnostics,
+            allInfosSuppressed,
+            allWarningsSuppressed,
+            allErrorsSuppressed
+        )
+    }
+
+    fun addGetClassCall(getClassCall: FirGetClassCall): PersistentCheckerContext {
+        return PersistentCheckerContext(
+            implicitReceiverStack,
+            containingDeclarations,
+            qualifiedAccesses,
+            getClassCalls.add(getClassCall),
+            sessionHolder,
+            returnTypeCalculator,
+            suppressedDiagnostics,
+            allInfosSuppressed,
+            allWarningsSuppressed,
+            allErrorsSuppressed
+        )
+    }
+
+    override fun addSuppressedDiagnostics(
+        diagnosticNames: Collection<String>,
+        allInfosSuppressed: Boolean,
+        allWarningsSuppressed: Boolean,
+        allErrorsSuppressed: Boolean
+    ): PersistentCheckerContext {
+        if (diagnosticNames.isEmpty()) return this
+        return PersistentCheckerContext(
+            implicitReceiverStack,
+            containingDeclarations,
+            qualifiedAccesses,
+            getClassCalls,
+            sessionHolder,
+            returnTypeCalculator,
+            suppressedDiagnostics.addAll(diagnosticNames),
+            this.allInfosSuppressed || allInfosSuppressed,
+            this.allWarningsSuppressed || allWarningsSuppressed,
+            this.allErrorsSuppressed || allErrorsSuppressed
+        )
+    }
+}

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAbstractSuperCallChecker.kt

@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
+import org.jetbrains.kotlin.fir.analysis.checkers.context.findClosest
 import org.jetbrains.kotlin.fir.analysis.checkers.getContainingClass
 import org.jetbrains.kotlin.fir.analysis.checkers.getDeclaration
 import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirSuperclassNotAccessibleFromInterfaceChecker.kt

@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression
 
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
+import org.jetbrains.kotlin.fir.analysis.checkers.context.findClosest
 import org.jetbrains.kotlin.fir.analysis.checkers.getContainingClass
 import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirValReassignmentViaBackingFieldChecker.kt

@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression
 
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
+import org.jetbrains.kotlin.fir.analysis.checkers.context.findClosest
 import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
 import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantVisibilityModifierChecker.kt

@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.FirFakeSourceElement
 import org.jetbrains.kotlin.fir.FirFakeSourceElementKind
 import org.jetbrains.kotlin.fir.analysis.checkers.*
 import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
+import org.jetbrains.kotlin.fir.analysis.checkers.context.findClosest
 import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirBasicDeclarationChecker
 import org.jetbrains.kotlin.fir.analysis.checkers.declaration.isLocalMember
 import org.jetbrains.kotlin.fir.analysis.diagnostics.*