From c73c73e85e2d0b344d7ca71178e2daca7b2333a3 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 29 Mar 2021 14:31:47 +0300 Subject: [PATCH] [Test] Simplify DiagnosticsService --- .../org/jetbrains/kotlin/test/services/DiagnosticsService.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/DiagnosticsService.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/DiagnosticsService.kt index 981653b7ac5..c0867af432e 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/DiagnosticsService.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/DiagnosticsService.kt @@ -11,9 +11,6 @@ import org.jetbrains.kotlin.test.util.* class DiagnosticsService(val testServices: TestServices) : TestService { private val conditionsPerModule: MutableMap> = mutableMapOf() - private val globalDefinedDiagnostics by lazy { - testServices.moduleStructure.allDirectives[DiagnosticsDirectives.DIAGNOSTICS] - } fun shouldRenderDiagnostic(module: TestModule, name: String): Boolean { val condition = conditionsPerModule.getOrPut(module) { @@ -23,7 +20,7 @@ class DiagnosticsService(val testServices: TestServices) : TestService { } private fun computeDiagnosticConditionForModule(module: TestModule): Condition { - val diagnosticsInDirective = module.directives[DiagnosticsDirectives.DIAGNOSTICS] + globalDefinedDiagnostics + val diagnosticsInDirective = module.directives[DiagnosticsDirectives.DIAGNOSTICS] val enabledNames = mutableSetOf() val disabledNames = mutableSetOf() for (diagnosticInDirective in diagnosticsInDirective) {