Type resolve transformer: reorder tower scope

This commit prioritizes inner scopes above outer scopes
(before this commit, inner scopes had lowest priority).
NB: really it's not precise enough too,
because explicit importing scope should have higher priority
than inner scopes.
Also fixes problem with total Kotlin resolve test introduced
in previous commit.

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt

@@ -26,18 +26,21 @@ import org.jetbrains.kotlin.fir.visitors.compose
 
 open class FirTypeResolveTransformer(
     private val traversedClassifiers: Set<FirMemberDeclaration> = setOf()
-) : FirAbstractTreeTransformerWithSuperTypes(reversedScopePriority = false) {
+) : FirAbstractTreeTransformerWithSuperTypes(reversedScopePriority = true) {
     override fun transformFile(file: FirFile, data: Nothing?): CompositeTransformResult<FirFile> {
         val session = file.session
-        towerScope.scopes += listOf(
+        return withScopeCleanup {
-            // from high priority to low priority
+            towerScope.scopes += listOf(
-            FirExplicitSimpleImportingScope(file.imports, session),
+                // from low priority to high priority
-            FirSelfImportingScope(file.packageFqName, session),
+                FirDefaultStarImportingScope(session),
-            FirDefaultSimpleImportingScope(session),
+                FirExplicitStarImportingScope(file.imports, session),
-            FirExplicitStarImportingScope(file.imports, session),
+                FirDefaultSimpleImportingScope(session),
-            FirDefaultStarImportingScope(session)
+                FirSelfImportingScope(file.packageFqName, session),
-        )
+                // TODO: explicit simple importing scope should have highest priority (higher than inner scopes added in process)
-        return super.transformFile(file, data)
+                FirExplicitSimpleImportingScope(file.imports, session)
+            )
+            super.transformFile(file, data)
+        }
     }
 
     private fun resolveSuperTypesAndExpansions(element: FirMemberDeclaration) {
@@ -50,61 +53,61 @@ open class FirTypeResolveTransformer(
     }
 
     override fun transformRegularClass(regularClass: FirRegularClass, data: Nothing?): CompositeTransformResult<FirDeclaration> {
-        return withScopeCleanup {
+        withScopeCleanup {
-            regularClass.withTypeParametersScope {
+            regularClass.addTypeParametersScope()
-                resolveSuperTypesAndExpansions(regularClass)
+            resolveSuperTypesAndExpansions(regularClass)
-
+            regularClass.typeParameters.forEach {
-                val firProvider = FirProvider.getInstance(regularClass.session)
+                it.accept(this, data)
-                val classId = regularClass.symbol.classId
-                towerScope.scopes += FirNestedClassifierScope(classId, firProvider)
-                val companionObjects = regularClass.declarations.filterIsInstance<FirRegularClass>().filter { it.isCompanion }
-                for (companionObject in companionObjects) {
-                    towerScope.scopes += FirNestedClassifierScope(companionObject.symbol.classId, firProvider)
-                }
-
-                lookupSuperTypes(regularClass).mapTo(towerScope.scopes) {
-                    val symbol = it.symbol
-                    if (symbol is FirBasedSymbol<*>) {
-                        FirNestedClassifierScope(symbol.classId, FirProvider.getInstance(symbol.fir.session))
-                    } else {
-                        FirNestedClassifierScope(symbol.classId, FirSymbolProvider.getInstance(regularClass.session))
-                    }
-                }
-                super.transformRegularClass(regularClass, data)
             }
         }
+        return withScopeCleanup {
+            val firProvider = FirProvider.getInstance(regularClass.session)
+            val classId = regularClass.symbol.classId
+            lookupSuperTypes(regularClass).asReversed().mapTo(towerScope.scopes) {
+                val symbol = it.symbol
+                if (symbol is FirBasedSymbol<*>) {
+                    FirNestedClassifierScope(symbol.classId, FirProvider.getInstance(symbol.fir.session))
+                } else {
+                    FirNestedClassifierScope(symbol.classId, FirSymbolProvider.getInstance(regularClass.session))
+                }
+            }
+            val companionObjects = regularClass.declarations.filterIsInstance<FirRegularClass>().filter { it.isCompanion }
+            for (companionObject in companionObjects) {
+                towerScope.scopes += FirNestedClassifierScope(companionObject.symbol.classId, firProvider)
+            }
+            towerScope.scopes += FirNestedClassifierScope(classId, firProvider)
+            regularClass.addTypeParametersScope()
+
+            super.transformRegularClass(regularClass, data)
+        }
     }
 
     override fun transformTypeAlias(typeAlias: FirTypeAlias, data: Nothing?): CompositeTransformResult<FirDeclaration> {
-        // TODO: Remove comment when KT-23742 fixed
+        return withScopeCleanup {
-        // Warning: boxing inline class here ()
+            typeAlias.addTypeParametersScope()
-        return typeAlias.withTypeParametersScope {
             resolveSuperTypesAndExpansions(typeAlias)
             super.transformTypeAlias(typeAlias, data)
         }
     }
 
 
-    private inline fun <T> FirMemberDeclaration.withTypeParametersScope(crossinline l: () -> T): T {
+    private fun FirMemberDeclaration.addTypeParametersScope() {
         val scopes = towerScope.scopes
         if (typeParameters.isNotEmpty()) {
             scopes += FirMemberTypeParameterScope(this)
         }
-        val result = l()
-        if (typeParameters.isNotEmpty()) {
-            scopes.removeAt(scopes.lastIndex)
-        }
-        return result
     }
 
     override fun transformProperty(property: FirProperty, data: Nothing?): CompositeTransformResult<FirDeclaration> {
-        return property.withTypeParametersScope {
+        return withScopeCleanup {
+            property.addTypeParametersScope()
             super.transformProperty(property, data)
         }
     }
 
     override fun transformNamedFunction(namedFunction: FirNamedFunction, data: Nothing?): CompositeTransformResult<FirDeclaration> {
-        return namedFunction.withTypeParametersScope {
+        return withScopeCleanup {
+            namedFunction.addTypeParametersScope()
             super.transformNamedFunction(namedFunction, data)
         }
     }

idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt

@@ -23,7 +23,7 @@ FILE: jvm.kt
 
         public final function test(): R|kotlin/Unit| {
             R|/A.foo|()
-            <Unresolved name: bar>#()
+            R|/A.bar|()
         }
 
     }