diff options
author | Kamil Doległo <kamilok1965@interia.pl> | 2020-03-16 14:33:38 +0100 |
---|---|---|
committer | Kamil Doległo <kamilok1965@users.noreply.github.com> | 2020-03-16 14:35:12 +0100 |
commit | 996feefe717ac623daabaadda71b5b9d2bbe1cf1 (patch) | |
tree | fca8d99c2cf4f9dcc64159b4e1ebe5644f2bd81b /core/src/main/kotlin/model/documentableProperties.kt | |
parent | cd38992a28a8b16cd91661f05829610d1373e47c (diff) | |
download | dokka-996feefe717ac623daabaadda71b5b9d2bbe1cf1.tar.gz dokka-996feefe717ac623daabaadda71b5b9d2bbe1cf1.tar.bz2 dokka-996feefe717ac623daabaadda71b5b9d2bbe1cf1.zip |
Rename Documentables to avoid name conflicts
Diffstat (limited to 'core/src/main/kotlin/model/documentableProperties.kt')
-rw-r--r-- | core/src/main/kotlin/model/documentableProperties.kt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/main/kotlin/model/documentableProperties.kt b/core/src/main/kotlin/model/documentableProperties.kt index 38a06451..67e5e88d 100644 --- a/core/src/main/kotlin/model/documentableProperties.kt +++ b/core/src/main/kotlin/model/documentableProperties.kt @@ -3,12 +3,12 @@ package org.jetbrains.dokka.model import org.jetbrains.dokka.model.properties.ExtraProperty import org.jetbrains.dokka.model.properties.MergeStrategy -data class InheritedFunction(val isInherited: Boolean): ExtraProperty<Function> { - object InheritedFunctionKey: ExtraProperty.Key<Function, Boolean> { +data class InheritedFunction(val isInherited: Boolean): ExtraProperty<DFunction> { + object InheritedFunctionKey: ExtraProperty.Key<DFunction, Boolean> { override fun mergeStrategyFor(left: Boolean, right: Boolean) = MergeStrategy.Fail { throw IllegalArgumentException("Function inheritance should be consistent!") } } - override val key: ExtraProperty.Key<Function, Boolean> = + override val key: ExtraProperty.Key<DFunction, Boolean> = InheritedFunctionKey }
\ No newline at end of file |