[FIR] Get rid of FirSessionProvider.project property

This commit is contained in:
Dmitriy Novozhilov
2020-10-07 13:06:42 +03:00
parent 82a2ecfe14
commit 20453bf0d8
8 changed files with 15 additions and 19 deletions
@@ -69,7 +69,7 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() {
val modules = createModules(groupedByModule)
val sessionProvider = FirProjectSessionProvider(project)
val sessionProvider = FirProjectSessionProvider()
//For BuiltIns, registered in sessionProvider automatically
val allProjectScope = GlobalSearchScope.allScope(project)
@@ -84,7 +84,7 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() {
val scope = TopDownAnalyzerFacadeForJVM.newModuleSearchScope(
project,
moduleFiles.mapNotNull { it.ktFile })
FirSessionFactory.createJavaModuleBasedSession(info, sessionProvider, scope) {
FirSessionFactory.createJavaModuleBasedSession(info, sessionProvider, scope, project) {
configureSession()
getFirExtensions()?.let {
registerExtensions(it)
@@ -28,8 +28,8 @@ fun createSession(
packagePartProvider: (GlobalSearchScope) -> PackagePartProvider
): FirSession {
val moduleInfo = FirTestModuleInfo(name = Name.identifier(moduleName))
val provider = FirProjectSessionProvider(project)
return FirSessionFactory.createJavaModuleBasedSession(moduleInfo, provider, sourceScope).also {
val provider = FirProjectSessionProvider()
return FirSessionFactory.createJavaModuleBasedSession(moduleInfo, provider, sourceScope, project).also {
createSessionForDependencies(project, provider, moduleInfo, librariesScope, packagePartProvider)
}
}