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

[Test] Filter dependent modules by source kind in creating FirModuleInfo

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-02-18 12:24:21 +03:00
parent 8c95b78346
commit 7b7b8fbea7
46 changed files with 3 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirModuleInfoProvider.kt
+2 -1
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.test.frontend.fir
import org.jetbrains.kotlin.fir.java.FirProjectSessionProvider
import org.jetbrains.kotlin.fir.session.FirJvmModuleInfo
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.test.model.DependencyKind
import org.jetbrains.kotlin.test.services.TestService
import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.dependencyProvider
@@ -24,7 +25,7 @@ class FirModuleInfoProvider(
fun convertToFirModuleInfo(module: TestModule): FirJvmModuleInfo {
return firModuleInfoByModule.getOrPut(module) {
val dependencies = mutableListOf(builtinsModuleInfoForModule(module))
module.dependencies.mapTo(dependencies) {
module.dependencies.filter { it.kind == DependencyKind.Source }.mapTo(dependencies) {
convertToFirModuleInfo(testServices.dependencyProvider.getTestModule(it.moduleName))
}
FirJvmModuleInfo(Name.identifier(module.name), dependencies)