[FIR] Refactoring: create use-site scopes via scope provider

This commit is contained in:
Simon Ogorodnik
2019-12-19 01:31:12 +03:00
committed by Mikhail Glukhikh
parent 5f08fe88a5
commit 1715f1a864
64 changed files with 536 additions and 296 deletions
@@ -20,6 +20,8 @@ import org.jetbrains.kotlin.fir.builder.RawFirBuilder
import org.jetbrains.kotlin.fir.declarations.FirFile
import org.jetbrains.kotlin.fir.dump.MultiModuleHtmlFirDump
import org.jetbrains.kotlin.fir.lightTree.LightTree2Fir
import org.jetbrains.kotlin.fir.resolve.firProvider
import org.jetbrains.kotlin.fir.resolve.impl.FirProviderImpl
import org.jetbrains.kotlin.fir.resolve.transformers.FirTotalResolveTransformer
import org.jetbrains.kotlin.fir.scopes.ProcessorAction
import org.jetbrains.kotlin.test.ConfigurationKind
@@ -58,11 +60,12 @@ class FirResolveModularizedTotalKotlinTest : AbstractModularizedTest() {
val session = createSession(environment, scope, librariesScope, moduleData.qualifiedName)
val totalTransformer = FirTotalResolveTransformer()
val firProvider = session.firProvider as FirProviderImpl
val firFiles = if (useLightTree) {
val lightTree2Fir = LightTree2Fir(session, stubMode = false)
val lightTree2Fir = LightTree2Fir(session, firProvider.kotlinScopeProvider, stubMode = false)
bench.buildFiles(lightTree2Fir, moduleData.sources.filter { it.extension == "kt" })
} else {
val builder = RawFirBuilder(session, stubMode = false)
val builder = RawFirBuilder(session, firProvider.kotlinScopeProvider, stubMode = false)
bench.buildFiles(builder, ktFiles)
}