[FIR] Move registration components out of initializers of FirSession

This commit is contained in:
Dmitriy Novozhilov
2020-05-29 10:24:26 +03:00
parent fec3e4faf1
commit b4ce736814
14 changed files with 157 additions and 161 deletions
@@ -88,7 +88,7 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() {
val scope = TopDownAnalyzerFacadeForJVM.newModuleSearchScope(
project,
moduleFiles.mapNotNull { it.ktFile })
FirJavaModuleBasedSession(info, sessionProvider, scope).also {
FirJavaModuleBasedSession.create(info, sessionProvider, scope).also {
registerFirExtensions(it.extensionService)
}
}
@@ -33,7 +33,7 @@ fun createSession(
): FirSession {
val moduleInfo = FirTestModuleInfo(name = Name.identifier(moduleName))
val provider = FirProjectSessionProvider(project)
return FirJavaModuleBasedSession(moduleInfo, provider, sourceScope).also {
return FirJavaModuleBasedSession.create(moduleInfo, provider, sourceScope).also {
createSessionForDependencies(project, provider, moduleInfo, librariesScope, packagePartProvider)
it.extensionService.registerExtensions(BunchOfRegisteredExtensions.empty())
}