[FIR] Extract duplicated code of processing classifiers from intersection scope

compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirUseSiteMemberScope.kt

@@ -198,16 +198,7 @@ abstract class AbstractFirUseSiteMemberScope(
 
     override fun processClassifiersByNameWithSubstitution(name: Name, processor: (FirClassifierSymbol<*>, ConeSubstitutor) -> Unit) {
         declaredMemberScope.processClassifiersByNameWithSubstitution(name, processor)
-
+        supertypeScopeContext.processClassifiersByNameWithSubstitution(name, absentClassifiersFromSupertypes, processor)
-        if (name in absentClassifiersFromSupertypes) return
-        val classifiers = supertypeScopeContext.collectClassifiers(name)
-        if (classifiers.isEmpty()) {
-            absentClassifiersFromSupertypes += name
-            return
-        }
-        for ((symbol, substitution) in classifiers) {
-            processor(symbol, substitution)
-        }
     }
 
     override fun processDeclaredConstructors(processor: (FirConstructorSymbol) -> Unit) {

compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScope.kt

@@ -63,17 +63,7 @@ class FirTypeIntersectionScope private constructor(
     }
 
     override fun processClassifiersByNameWithSubstitution(name: Name, processor: (FirClassifierSymbol<*>, ConeSubstitutor) -> Unit) {
-        if (name in absentClassifiers) {
+        intersectionContext.processClassifiersByNameWithSubstitution(name, absentClassifiers, processor)
-            return
-        }
-        val classifiersWithSubstitution = intersectionContext.collectClassifiers(name)
-        if (classifiersWithSubstitution.isEmpty()) {
-            absentClassifiers += name
-            return
-        }
-        for ((symbol, substitution) in classifiersWithSubstitution) {
-            processor(symbol, substitution)
-        }
     }
 
     @Suppress("UNCHECKED_CAST")

compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScopeContext.kt

@@ -78,8 +78,23 @@ class FirTypeIntersectionScopeContext(
         }
     }
 
-    @OptIn(PrivateForInline::class)
+    fun processClassifiersByNameWithSubstitution(
-    fun collectClassifiers(name: Name): List<Pair<FirClassifierSymbol<*>, ConeSubstitutor>> {
+        name: Name,
+        absentClassifierNames: MutableSet<Name>,
+        processor: (FirClassifierSymbol<*>, ConeSubstitutor) -> Unit
+    ) {
+        if (name in absentClassifierNames) return
+        val classifiers = collectClassifiers(name)
+        if (classifiers.isEmpty()) {
+            absentClassifierNames += name
+            return
+        }
+        for ((symbol, substitution) in classifiers) {
+            processor(symbol, substitution)
+        }
+    }
+
+    private fun collectClassifiers(name: Name): List<Pair<FirClassifierSymbol<*>, ConeSubstitutor>> {
         val accepted = HashSet<FirClassifierSymbol<*>>()
         val pending = mutableListOf<FirClassifierSymbol<*>>()
         val result = mutableListOf<Pair<FirClassifierSymbol<*>, ConeSubstitutor>>()