From 8658fd40e3674e29ef10e1fc4289d26caea1e762 Mon Sep 17 00:00:00 2001 From: Szymon Świstun Date: Thu, 5 Mar 2020 11:40:22 +0100 Subject: Add warning when unused extension points are found --- core/src/main/kotlin/plugability/DokkaContext.kt | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'core/src/main/kotlin/plugability/DokkaContext.kt') diff --git a/core/src/main/kotlin/plugability/DokkaContext.kt b/core/src/main/kotlin/plugability/DokkaContext.kt index 5d5a8ebf..c5a08a56 100644 --- a/core/src/main/kotlin/plugability/DokkaContext.kt +++ b/core/src/main/kotlin/plugability/DokkaContext.kt @@ -1,9 +1,9 @@ package org.jetbrains.dokka.plugability import org.jetbrains.dokka.DokkaConfiguration -import org.jetbrains.dokka.utilities.DokkaLogger import org.jetbrains.dokka.EnvironmentAndFacade import org.jetbrains.dokka.pages.PlatformData +import org.jetbrains.dokka.utilities.DokkaLogger import java.io.File import java.net.URLClassLoader import java.util.* @@ -22,6 +22,8 @@ interface DokkaContext { val logger: DokkaLogger val configuration: DokkaConfiguration val platforms: Map + val unusedPoints: Collection> + companion object { fun create( @@ -43,7 +45,7 @@ interface DokkaContext { } } -inline fun DokkaContext.plugin(): T = plugin(T::class) +inline fun DokkaContext.plugin(): T = plugin(T::class) ?: throw java.lang.IllegalStateException("Plugin ${T::class.qualifiedName} is not present in context.") interface DokkaContextConfiguration { @@ -58,6 +60,10 @@ private class DokkaContextConfigurationImpl( private val plugins = mutableMapOf, DokkaPlugin>() private val pluginStubs = mutableMapOf, DokkaPlugin>() internal val extensions = mutableMapOf, MutableList>>() + val pointsUsed: MutableSet> = mutableSetOf() + val pointsPopulated: MutableSet> = mutableSetOf() + override val unusedPoints: Set> + get() = pointsPopulated - pointsUsed private enum class State { UNVISITED, @@ -74,9 +80,9 @@ private class DokkaContextConfigurationImpl( fun visit(n: Extension<*>) { val state = verticesWithState[n] - if(state == State.VISITED) + if (state == State.VISITED) return - if(state == State.VISITING) + if (state == State.VISITING) throw Error("Detected cycle in plugins graph") verticesWithState[n] = State.VISITING adjacencyList[n]?.forEach { visit(it) } @@ -84,24 +90,26 @@ private class DokkaContextConfigurationImpl( result += n } - for((vertex, state) in verticesWithState) { - if(state == State.UNVISITED) + for ((vertex, state) in verticesWithState) { + if (state == State.UNVISITED) visit(vertex) } result.asReversed().forEach { + pointsPopulated += it.extensionPoint extensions.getOrPut(it.extensionPoint, ::mutableListOf) += it } } @Suppress("UNCHECKED_CAST") override operator fun get(point: E) where T : Any, E : ExtensionPoint = - actions(point).orEmpty() as List + actions(point).also { pointsUsed += point }.orEmpty() as List @Suppress("UNCHECKED_CAST") override fun single(point: E): T where T : Any, E : ExtensionPoint { fun throwBadArity(substitution: String): Nothing = throw IllegalStateException( "$point was expected to have exactly one extension registered, but $substitution found." ) + pointsUsed += point val extensions = extensions[point].orEmpty() as List> return when (extensions.size) { @@ -109,7 +117,7 @@ private class DokkaContextConfigurationImpl( 1 -> extensions.single().action.get(this) else -> { val notFallbacks = extensions.filterNot { it.isFallback } - if (notFallbacks.size == 1) notFallbacks.single().action.get(this) else throwBadArity("many were") + if (notFallbacks.size == 1) notFallbacks.single().action.get(this) else throwBadArity("many were") } } } -- cgit