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

Extract FirMemberScopeProvider to a separate file

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-10-23 19:27:06 +03:00
parent b86f529a8a
commit f63c3aeac9
2 changed files with 66 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassDeclaredMemberScope.kt
+4 -54
View File
@@ -5,69 +5,19 @@
package org.jetbrains.kotlin.fir.scopes.impl package org.jetbrains.kotlin.fir.scopes.impl
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.FirSessionComponent
import org.jetbrains.kotlin.fir.declarations.FirCallableMemberDeclaration import org.jetbrains.kotlin.fir.declarations.FirCallableMemberDeclaration
import org.jetbrains.kotlin.fir.declarations.FirConstructor import org.jetbrains.kotlin.fir.declarations.FirConstructor
import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirRegularClass
import org.jetbrains.kotlin.fir.resolve.memberScopeProvider
import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.fir.scopes.FirScope
import org.jetbrains.kotlin.fir.scopes.ProcessorAction import org.jetbrains.kotlin.fir.scopes.ProcessorAction
import org.jetbrains.kotlin.fir.scopes.ProcessorAction.NEXT import org.jetbrains.kotlin.fir.scopes.ProcessorAction.NEXT
import org.jetbrains.kotlin.fir.scopes.ProcessorAction.STOP import org.jetbrains.kotlin.fir.scopes.ProcessorAction.STOP
import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.fir.symbols.impl.FirClassifierSymbol
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
class FirMemberScopeProvider : FirSessionComponent {
private val declaredMemberCache = mutableMapOf<FirRegularClass, FirClassDeclaredMemberScope>()
private val nestedClassifierCache = mutableMapOf<FirRegularClass, FirNestedClassifierScope>()
private val selfImportingCache = mutableMapOf<FqName, FirSelfImportingScope>()
fun declaredMemberScope(klass: FirRegularClass): FirClassDeclaredMemberScope {
return declaredMemberCache.getOrPut(klass) {
FirClassDeclaredMemberScope(klass)
}
}
fun nestedClassifierScope(klass: FirRegularClass): FirNestedClassifierScope {
return nestedClassifierCache.getOrPut(klass) {
FirNestedClassifierScope(klass)
}
}
// 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 declaredMemberScope(klass: FirRegularClass): FirClassDeclaredMemberScope {
return klass
.session
.memberScopeProvider
.declaredMemberScope(klass)
}
fun nestedClassifierScope(klass: FirRegularClass): FirNestedClassifierScope {
return klass
.session
.memberScopeProvider
.nestedClassifierScope(klass)
}
fun nestedClassifierScope(classId: ClassId, session: FirSession): FirLazyNestedClassifierScope {
return FirLazyNestedClassifierScope(classId, session)
}
fun selfImportingScope(fqName: FqName, session: FirSession): FirSelfImportingScope {
return session.memberScopeProvider.selfImportingScope(fqName, session)
}
class FirClassDeclaredMemberScope(klass: FirRegularClass) : FirScope() { class FirClassDeclaredMemberScope(klass: FirRegularClass) : FirScope() {
private val nestedClassifierScope = nestedClassifierScope(klass) private val nestedClassifierScope = nestedClassifierScope(klass)
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirMemberScopeProvider.kt
+62
View File
@@ -0,0 +1,62 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.fir.scopes.impl
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.FirSessionComponent
import org.jetbrains.kotlin.fir.declarations.FirRegularClass
import org.jetbrains.kotlin.fir.resolve.memberScopeProvider
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
class FirMemberScopeProvider : FirSessionComponent {
private val declaredMemberCache = mutableMapOf<FirRegularClass, FirClassDeclaredMemberScope>()
private val nestedClassifierCache = mutableMapOf<FirRegularClass, FirNestedClassifierScope>()
private val selfImportingCache = mutableMapOf<FqName, FirSelfImportingScope>()
fun declaredMemberScope(klass: FirRegularClass): FirClassDeclaredMemberScope {
return declaredMemberCache.getOrPut(klass) {
FirClassDeclaredMemberScope(klass)
}
}
fun nestedClassifierScope(klass: FirRegularClass): FirNestedClassifierScope {
return nestedClassifierCache.getOrPut(klass) {
FirNestedClassifierScope(klass)
}
}
// 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 declaredMemberScope(klass: FirRegularClass): FirClassDeclaredMemberScope {
return klass
.session
.memberScopeProvider
.declaredMemberScope(klass)
}
fun nestedClassifierScope(klass: FirRegularClass): FirNestedClassifierScope {
return klass
.session
.memberScopeProvider
.nestedClassifierScope(klass)
}
fun nestedClassifierScope(classId: ClassId, session: FirSession): FirLazyNestedClassifierScope {
return FirLazyNestedClassifierScope(classId, session)
}
fun selfImportingScope(fqName: FqName, session: FirSession): FirSelfImportingScope {
return session.memberScopeProvider.selfImportingScope(fqName, session)
}