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

[LL API] Adjust services required by LLFirBuiltinsSessionFactory

Browse Source 
As 'initialiseVirtualFileFinderServices()' that is run during
test initialization collects transitive dependencies, all of them
must be ready. However, 'KtNotUnderContentRootModuleForTest' has a
built-in dependency provided by 'LLFirBuiltinsSessionFactory'.
This commit is contained in:
Yan Zhulanow
2023-01-24 17:56:04 +09:00
committed by Space Team
parent f199671c4d
commit f6f667c387
10 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/ProjectStructureInitialisationPreAnalysisHandler.kt
+2 -1
View File
@@ -30,8 +30,9 @@ class ProjectStructureInitialisationPreAnalysisHandler(
configurator.registerApplicationServices(application, testServices)
createAndRegisterKtModules(moduleStructure, project)
configurator.registerProjectExtensionPoints(project, testServices)
testServices.environmentManager.initializeProjectStructure()
configurator.registerProjectServices(project, testServices)
testServices.environmentManager.initializeProjectStructure()
configurator.registerProjectModelServices(project, testServices)
}
private fun createAndRegisterKtModules(moduleStructure: TestModuleStructure, project: MockProject) {
analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/test/configurators/AnalysisApiTestConfigurator.kt
+4
View File
@@ -57,6 +57,10 @@ abstract class AnalysisApiTestConfigurator {
serviceRegistrars.forEach { it.registerProjectServices(project, testServices) }
}
fun registerProjectModelServices(project: MockProject, testServices: TestServices) {
serviceRegistrars.forEach { it.registerProjectModelServices(project, testServices) }
}
fun registerApplicationServices(application: MockApplication, testServices: TestServices) {
ApplicationServiceRegistrar.register(application, serviceRegistrars, testServices)
}
analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/test/configurators/AnalysisApiTestServiceRegistrar.kt
+3 -1
View File
@@ -10,9 +10,11 @@ import com.intellij.mock.MockProject
import org.jetbrains.kotlin.test.services.TestServices
abstract class AnalysisApiTestServiceRegistrar {
abstract fun registerApplicationServices(application: MockApplication, testServices: TestServices)
abstract fun registerProjectExtensionPoints(project: MockProject, testServices: TestServices)
abstract fun registerProjectServices(project: MockProject, testServices: TestServices)
abstract fun registerApplicationServices(application: MockApplication, testServices: TestServices)
abstract fun registerProjectModelServices(project: MockProject, testServices: TestServices)
}