azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename: FirSelfImportingScope -> FirPackageMemberScope

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-12-19 12:43:21 +03:00
parent 4e14d04926
commit 4d1b032c1f
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt
+1 -1
View File
@@ -26,7 +26,7 @@ fun createImportingScopes(
FirExplicitStarImportingScope(file.imports, session, scopeSession), FirExplicitStarImportingScope(file.imports, session, scopeSession),
FirDefaultSimpleImportingScope(session, scopeSession, priority = DefaultImportPriority.LOW), FirDefaultSimpleImportingScope(session, scopeSession, priority = DefaultImportPriority.LOW),
FirDefaultSimpleImportingScope(session, scopeSession, priority = DefaultImportPriority.HIGH), 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) // TODO: explicit simple importing scope should have highest priority (higher than inner scopes added in process)
FirExplicitSimpleImportingScope(file.imports, session, scopeSession) FirExplicitSimpleImportingScope(file.imports, session, scopeSession)
) )
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirMemberScopeProvider.kt
+6 -6
View File
@@ -19,7 +19,7 @@ class FirMemberScopeProvider : FirSessionComponent {
private val declaredMemberCache = mutableMapOf<FirClass<*>, FirScope>() private val declaredMemberCache = mutableMapOf<FirClass<*>, FirScope>()
private val nestedClassifierCache = mutableMapOf<FirClass<*>, FirNestedClassifierScope>() private val nestedClassifierCache = mutableMapOf<FirClass<*>, FirNestedClassifierScope>()
private val selfImportingCache = mutableMapOf<FqName, FirSelfImportingScope>() private val packageMemberCache = mutableMapOf<FqName, FirPackageMemberScope>()
fun declaredMemberScope( fun declaredMemberScope(
klass: FirClass<*>, klass: FirClass<*>,
@@ -39,9 +39,9 @@ class FirMemberScopeProvider : FirSessionComponent {
} }
// TODO: it's better to cache this scope in ScopeSession // TODO: it's better to cache this scope in ScopeSession
fun selfImportingScope(fqName: FqName, session: FirSession): FirSelfImportingScope { fun packageMemberScope(fqName: FqName, session: FirSession): FirPackageMemberScope {
return selfImportingCache.getOrPut(fqName) { return packageMemberCache.getOrPut(fqName) {
FirSelfImportingScope(fqName, session) FirPackageMemberScope(fqName, session)
} }
} }
} }
@@ -79,7 +79,7 @@ fun lazyNestedClassifierScope(
return FirLazyNestedClassifierScope(classId, existingNames, symbolProvider) return FirLazyNestedClassifierScope(classId, existingNames, symbolProvider)
} }
fun selfImportingScope(fqName: FqName, session: FirSession): FirSelfImportingScope { fun packageMemberScope(fqName: FqName, session: FirSession): FirPackageMemberScope {
return session.memberScopeProvider.selfImportingScope(fqName, session) return session.memberScopeProvider.packageMemberScope(fqName, session)
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirSelfImportingScope.kt → compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirPackageMemberScope.kt
+1 -1
View File
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name 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) private val symbolProvider = FirSymbolProvider.getInstance(session)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirResolutionApi.kt
+2 -2
View File
@@ -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.body.resolve.FirDesignatedBodyResolveTransformer
import org.jetbrains.kotlin.fir.resolve.transformers.runResolve import org.jetbrains.kotlin.fir.resolve.transformers.runResolve
import org.jetbrains.kotlin.fir.scopes.ProcessorAction 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.CallableId
import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
import org.jetbrains.kotlin.fir.types.FirErrorTypeRef 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)}") }?.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) // 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 var result: FirCallableDeclaration<*>? = null
val processor = { symbol: FirCallableSymbol<*> -> val processor = { symbol: FirCallableSymbol<*> ->
val fir = symbol.fir val fir = symbol.fir