Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix filtering suppresed extensions #2348

Merged
merged 1 commit into from Feb 14, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion core/src/main/kotlin/plugability/DokkaContext.kt
Expand Up @@ -124,7 +124,11 @@ private class DokkaContextConfigurationImpl(
}

private fun findNotOverridden(bucket: Set<Extension<*, *, *>>): Extension<*, *, *> {
val filtered = bucket.filter { it !in suppressedExtensions }
// Let's filter out all suppressedExtensions that are not only overrides.
// suppressedExtensions can be polluted by suppressions that completely disables the extension, and would break dokka behaviour
// if not filtered out
val suppressedExtensionsByOverrides = suppressedExtensions.filterNot { it.value.any { it !is Suppression.ByExtension } }
val filtered = bucket.filterNot { it in suppressedExtensionsByOverrides }
return filtered.singleOrNull()
?: throw IllegalStateException("Conflicting overrides: $filtered")
}
Expand Down