Rename: FirSelfImportingScope -> FirPackageMemberScope

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt

@@ -26,7 +26,7 @@ fun createImportingScopes(
         FirExplicitStarImportingScope(file.imports, session, scopeSession),
         FirDefaultSimpleImportingScope(session, scopeSession, priority = DefaultImportPriority.LOW),
         FirDefaultSimpleImportingScope(session, scopeSession, priority = DefaultImportPriority.HIGH),
-        selfImportingScope(file.packageFqName, session),
+        packageMemberScope(file.packageFqName, session),
         // TODO: explicit simple importing scope should have highest priority (higher than inner scopes added in process)
         FirExplicitSimpleImportingScope(file.imports, session, scopeSession)
     )

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirMemberScopeProvider.kt

@@ -19,7 +19,7 @@ class FirMemberScopeProvider : FirSessionComponent {
 
     private val declaredMemberCache = mutableMapOf<FirClass<*>, FirScope>()
     private val nestedClassifierCache = mutableMapOf<FirClass<*>, FirNestedClassifierScope>()
-    private val selfImportingCache = mutableMapOf<FqName, FirSelfImportingScope>()
+    private val packageMemberCache = mutableMapOf<FqName, FirPackageMemberScope>()
 
     fun declaredMemberScope(
         klass: FirClass<*>,
@@ -39,9 +39,9 @@ class FirMemberScopeProvider : FirSessionComponent {
     }
 
     // TODO: it's better to cache this scope in ScopeSession
-    fun selfImportingScope(fqName: FqName, session: FirSession): FirSelfImportingScope {
-        return selfImportingCache.getOrPut(fqName) {
-            FirSelfImportingScope(fqName, session)
+    fun packageMemberScope(fqName: FqName, session: FirSession): FirPackageMemberScope {
+        return packageMemberCache.getOrPut(fqName) {
+            FirPackageMemberScope(fqName, session)
         }
     }
 }
@@ -79,7 +79,7 @@ fun lazyNestedClassifierScope(
     return FirLazyNestedClassifierScope(classId, existingNames, symbolProvider)
 }
 
-fun selfImportingScope(fqName: FqName, session: FirSession): FirSelfImportingScope {
-    return session.memberScopeProvider.selfImportingScope(fqName, session)
+fun packageMemberScope(fqName: FqName, session: FirSession): FirPackageMemberScope {
+    return session.memberScopeProvider.packageMemberScope(fqName, session)
 }
 

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirPackageMemberScope.kt

@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 
-class FirSelfImportingScope(val fqName: FqName, val session: FirSession) : FirScope() {
+class FirPackageMemberScope(val fqName: FqName, val session: FirSession) : FirScope() {
 
     private val symbolProvider = FirSymbolProvider.getInstance(session)
 

idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirResolutionApi.kt

@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.resolve.getClassDeclaredCallableSymbols
 import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirDesignatedBodyResolveTransformer
 import org.jetbrains.kotlin.fir.resolve.transformers.runResolve
 import org.jetbrains.kotlin.fir.scopes.ProcessorAction
-import org.jetbrains.kotlin.fir.scopes.impl.FirSelfImportingScope
+import org.jetbrains.kotlin.fir.scopes.impl.FirPackageMemberScope
 import org.jetbrains.kotlin.fir.symbols.CallableId
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 import org.jetbrains.kotlin.fir.types.FirErrorTypeRef
@@ -51,7 +51,7 @@ private fun FirFile.findCallableMember(
             }?.fir ?: error("Cannot find FIR callable declaration ${CallableId(packageFqName, klassFqName, declName)}")
     }
     // NB: not sure it's correct to use member scope provider from here (because of possible changes)
-    val memberScope = FirSelfImportingScope(this.packageFqName, session)
+    val memberScope = FirPackageMemberScope(this.packageFqName, session)
     var result: FirCallableDeclaration<*>? = null
     val processor = { symbol: FirCallableSymbol<*> ->
         val fir = symbol.fir