aboutsummaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
Diffstat (limited to 'core/src')
-rw-r--r--core/src/main/kotlin/model/documentableProperties.kt7
1 files changed, 3 insertions, 4 deletions
diff --git a/core/src/main/kotlin/model/documentableProperties.kt b/core/src/main/kotlin/model/documentableProperties.kt
index 67e5e88d..f630ba3b 100644
--- a/core/src/main/kotlin/model/documentableProperties.kt
+++ b/core/src/main/kotlin/model/documentableProperties.kt
@@ -4,11 +4,10 @@ import org.jetbrains.dokka.model.properties.ExtraProperty
import org.jetbrains.dokka.model.properties.MergeStrategy
data class InheritedFunction(val isInherited: Boolean): ExtraProperty<DFunction> {
- object InheritedFunctionKey: ExtraProperty.Key<DFunction, Boolean> {
- override fun mergeStrategyFor(left: Boolean, right: Boolean) = MergeStrategy.Fail {
+ companion object : ExtraProperty.Key<DFunction, InheritedFunction> {
+ override fun mergeStrategyFor(left: InheritedFunction, right: InheritedFunction) = MergeStrategy.Fail {
throw IllegalArgumentException("Function inheritance should be consistent!")
}
}
- override val key: ExtraProperty.Key<DFunction, Boolean> =
- InheritedFunctionKey
+ override val key: ExtraProperty.Key<DFunction, *> = InheritedFunction
} \ No newline at end of file