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

[Test] Simplify DiagnosticsService

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-03-29 14:31:47 +03:00
committed by TeamCityServer
parent cd890d5833
commit c73c73e85e
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/DiagnosticsService.kt
+1 -4
View File
@@ -11,9 +11,6 @@ import org.jetbrains.kotlin.test.util.*
class DiagnosticsService(val testServices: TestServices) : TestService { class DiagnosticsService(val testServices: TestServices) : TestService {
private val conditionsPerModule: MutableMap<TestModule, Condition<String>> = mutableMapOf() private val conditionsPerModule: MutableMap<TestModule, Condition<String>> = mutableMapOf()
private val globalDefinedDiagnostics by lazy {
testServices.moduleStructure.allDirectives[DiagnosticsDirectives.DIAGNOSTICS]
}
fun shouldRenderDiagnostic(module: TestModule, name: String): Boolean { fun shouldRenderDiagnostic(module: TestModule, name: String): Boolean {
val condition = conditionsPerModule.getOrPut(module) { val condition = conditionsPerModule.getOrPut(module) {
@@ -23,7 +20,7 @@ class DiagnosticsService(val testServices: TestServices) : TestService {
} }
private fun computeDiagnosticConditionForModule(module: TestModule): Condition<String> { private fun computeDiagnosticConditionForModule(module: TestModule): Condition<String> {
val diagnosticsInDirective = module.directives[DiagnosticsDirectives.DIAGNOSTICS] + globalDefinedDiagnostics val diagnosticsInDirective = module.directives[DiagnosticsDirectives.DIAGNOSTICS]
val enabledNames = mutableSetOf<String>() val enabledNames = mutableSetOf<String>()
val disabledNames = mutableSetOf<String>() val disabledNames = mutableSetOf<String>()
for (diagnosticInDirective in diagnosticsInDirective) { for (diagnosticInDirective in diagnosticsInDirective) {