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

[Test] Allow to enable some diagnostics in tests if it's severity is disabled

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2022-02-08 13:38:26 +03:00
committed by teamcity
parent 1d28e4e307
commit 3abac1d56a
1 changed files with 24 additions and 18 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
+24 -18
View File
@@ -19,21 +19,33 @@ class DiagnosticsService(val testServices: TestServices) : TestService {
) )
} }
private val conditionsPerModule: MutableMap<TestModule, Pair<Condition<String>, Condition<Severity>>> = mutableMapOf() private val conditionsPerModule: MutableMap<TestModule, DiagnosticConditions> = mutableMapOf()
private data class DiagnosticConditions(
val allowedDiagnostics: Set<String>,
val disabledDiagnostics: Set<String>,
val severityMap: Map<Severity, Boolean>
)
fun shouldRenderDiagnostic(module: TestModule, name: String, severity: Severity): Boolean { fun shouldRenderDiagnostic(module: TestModule, name: String, severity: Severity): Boolean {
val (nameCondition, severityCondition) = conditionsPerModule.getOrPut(module) { val conditions = conditionsPerModule.getOrPut(module) {
computeDiagnosticConditionForModule(module) computeDiagnosticConditionForModule(module)
} }
return severityCondition(severity) && nameCondition(name)
val severityAllowed = conditions.severityMap.getOrDefault(severity, true)
return if (severityAllowed) {
name !in conditions.disabledDiagnostics || name in conditions.allowedDiagnostics
} else {
name in conditions.allowedDiagnostics
}
} }
private fun computeDiagnosticConditionForModule(module: TestModule): Pair<Condition<String>, Condition<Severity>> { private fun computeDiagnosticConditionForModule(module: TestModule): DiagnosticConditions {
val diagnosticsInDirective = module.directives[DiagnosticsDirectives.DIAGNOSTICS] val diagnosticsInDirective = module.directives[DiagnosticsDirectives.DIAGNOSTICS]
val enabledNames = mutableSetOf<String>() val enabledNames = mutableSetOf<String>()
val disabledNames = mutableSetOf<String>() val disabledNames = mutableSetOf<String>()
val enabledSeverities = mutableSetOf<Severity>() val severityMap = mutableMapOf<Severity, Boolean>()
val disabledSeverities = mutableSetOf<Severity>()
for (diagnosticInDirective in diagnosticsInDirective) { for (diagnosticInDirective in diagnosticsInDirective) {
val enabled = when { val enabled = when {
diagnosticInDirective.startsWith("+") -> true diagnosticInDirective.startsWith("+") -> true
@@ -43,23 +55,17 @@ class DiagnosticsService(val testServices: TestServices) : TestService {
val name = diagnosticInDirective.substring(1) val name = diagnosticInDirective.substring(1)
val severity = severityNameMapping[name] val severity = severityNameMapping[name]
if (severity != null) { if (severity != null) {
val collection = if (enabled) enabledSeverities else disabledSeverities severityMap[severity] = enabled
collection += severity
} else { } else {
val collection = if (enabled) enabledNames else disabledNames val collection = if (enabled) enabledNames else disabledNames
collection += name collection += name
} }
} }
return computeCondition(enabledNames, disabledNames) to computeCondition(enabledSeverities, disabledSeverities) return DiagnosticConditions(
} enabledNames,
disabledNames,
private fun <T : Any> computeCondition(enabled: Set<T>, disabled: Set<T>): Condition<T> { severityMap
if (disabled.isEmpty()) return Conditions.alwaysTrue() )
var condition = !Conditions.oneOf(disabled)
if (enabled.isNotEmpty()) {
condition = condition or Conditions.oneOf(enabled)
}
return condition.cached()
} }
} }