From 1756857237f472600ae59bedbc7e8529087ab576 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 13 Jan 2020 10:50:23 +0300 Subject: [PATCH] Rename: FirMemberScopeProvider -> FirDeclaredMemberScopeProvider --- .../kotlin/fir/java/FirJavaModuleBasedSession.kt | 4 ++-- .../org/jetbrains/kotlin/fir/FirModuleBasedSession.kt | 4 ++-- .../org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt | 4 ++-- ...peProvider.kt => FirDeclaredMemberScopeProvider.kt} | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) rename compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/{FirMemberScopeProvider.kt => FirDeclaredMemberScopeProvider.kt} (90%) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt index 3e640bef338..b149430e2f4 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.resolve.impl.FirLibrarySymbolProviderImpl import org.jetbrains.kotlin.fir.resolve.impl.FirProviderImpl import org.jetbrains.kotlin.fir.resolve.scopes.wrapScopeWithJvmMapped import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider -import org.jetbrains.kotlin.fir.scopes.impl.FirMemberScopeProvider +import org.jetbrains.kotlin.fir.scopes.impl.FirDeclaredMemberScopeProvider import org.jetbrains.kotlin.fir.types.FirCorrespondingSupertypesCache import org.jetbrains.kotlin.load.java.JavaClassFinder import org.jetbrains.kotlin.load.java.JavaClassFinderImpl @@ -109,7 +109,7 @@ class FirLibrarySession private constructor( ) ) as FirSymbolProvider ) - registerComponent(FirMemberScopeProvider::class, FirMemberScopeProvider()) + registerComponent(FirDeclaredMemberScopeProvider::class, FirDeclaredMemberScopeProvider()) registerComponent( FirCorrespondingSupertypesCache::class, diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirModuleBasedSession.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirModuleBasedSession.kt index 4260f4ecbad..4949c682af5 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirModuleBasedSession.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirModuleBasedSession.kt @@ -8,14 +8,14 @@ package org.jetbrains.kotlin.fir import org.jetbrains.kotlin.analyzer.ModuleInfo import org.jetbrains.kotlin.fir.resolve.* import org.jetbrains.kotlin.fir.resolve.impl.* -import org.jetbrains.kotlin.fir.scopes.impl.FirMemberScopeProvider +import org.jetbrains.kotlin.fir.scopes.impl.FirDeclaredMemberScopeProvider abstract class FirModuleBasedSession(override val moduleInfo: ModuleInfo, sessionProvider: FirSessionProvider?) : FirSessionBase(sessionProvider) { init { registerComponent(FirQualifierResolver::class, FirQualifierResolverImpl(this)) registerComponent(FirTypeResolver::class, FirTypeResolverImpl(this)) - registerComponent(FirMemberScopeProvider::class, FirMemberScopeProvider()) + registerComponent(FirDeclaredMemberScopeProvider::class, FirDeclaredMemberScopeProvider()) } } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt index 0c119fccfd5..3937bc2f465 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.resolve.calls.FirNamedReferenceWithCandidate import org.jetbrains.kotlin.fir.resolve.diagnostics.FirUnresolvedNameError import org.jetbrains.kotlin.fir.resolve.substitution.AbstractConeSubstitutor import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.resultType -import org.jetbrains.kotlin.fir.scopes.impl.FirMemberScopeProvider +import org.jetbrains.kotlin.fir.scopes.impl.FirDeclaredMemberScopeProvider import org.jetbrains.kotlin.fir.scopes.impl.withReplacedConeType import org.jetbrains.kotlin.fir.symbols.* import org.jetbrains.kotlin.fir.symbols.impl.* @@ -51,7 +51,7 @@ inline fun MutableMap.getOrPut(key: K, defaultValue: (K) -> val FirSession.firSymbolProvider: FirSymbolProvider by componentArrayAccessor() val FirSession.firProvider: FirProvider by componentArrayAccessor() val FirSession.correspondingSupertypesCache: FirCorrespondingSupertypesCache by componentArrayAccessor() -val FirSession.memberScopeProvider: FirMemberScopeProvider by componentArrayAccessor() +val FirSession.declaredMemberScopeProvider: FirDeclaredMemberScopeProvider by componentArrayAccessor() fun ConeClassLikeLookupTag.toSymbol(useSiteSession: FirSession): FirClassLikeSymbol<*>? { if (this is ConeClassLookupTagWithFixedSymbol) { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirMemberScopeProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDeclaredMemberScopeProvider.kt similarity index 90% rename from compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirMemberScopeProvider.kt rename to compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDeclaredMemberScopeProvider.kt index 7ced4f77a1f..94451ee5a32 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirMemberScopeProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDeclaredMemberScopeProvider.kt @@ -8,12 +8,12 @@ package org.jetbrains.kotlin.fir.scopes.impl import org.jetbrains.kotlin.fir.FirSessionComponent import org.jetbrains.kotlin.fir.declarations.FirClass import org.jetbrains.kotlin.fir.resolve.FirSymbolProvider -import org.jetbrains.kotlin.fir.resolve.memberScopeProvider +import org.jetbrains.kotlin.fir.resolve.declaredMemberScopeProvider import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name -class FirMemberScopeProvider : FirSessionComponent { +class FirDeclaredMemberScopeProvider : FirSessionComponent { private val declaredMemberCache = mutableMapOf, FirScope>() private val nestedClassifierCache = mutableMapOf, FirNestedClassifierScope>() @@ -39,7 +39,7 @@ class FirMemberScopeProvider : FirSessionComponent { fun declaredMemberScope(klass: FirClass<*>): FirScope { return klass .session - .memberScopeProvider + .declaredMemberScopeProvider .declaredMemberScope(klass, useLazyNestedClassifierScope = false, existingNames = null, symbolProvider = null) } @@ -50,14 +50,14 @@ fun declaredMemberScopeWithLazyNestedScope( ): FirScope { return klass .session - .memberScopeProvider + .declaredMemberScopeProvider .declaredMemberScope(klass, useLazyNestedClassifierScope = true, existingNames = existingNames, symbolProvider = symbolProvider) } fun nestedClassifierScope(klass: FirClass<*>): FirNestedClassifierScope { return klass .session - .memberScopeProvider + .declaredMemberScopeProvider .nestedClassifierScope(klass) }