aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/kotlin/model
diff options
context:
space:
mode:
authorsebastian.sellmair <sebastian.sellmair@jetbrains.com>2020-08-13 10:32:52 +0200
committerSebastian Sellmair <34319766+sellmair@users.noreply.github.com>2020-08-17 11:52:28 +0200
commit5a7e14eaaa4278343ff628c692d475be9732c94e (patch)
treec24a5c821429dff9c781d1e950883da56ef66a03 /core/src/main/kotlin/model
parentf6ac2b0f0a0183171aa2f6806ec67d8d21692a36 (diff)
downloaddokka-5a7e14eaaa4278343ff628c692d475be9732c94e.tar.gz
dokka-5a7e14eaaa4278343ff628c692d475be9732c94e.tar.bz2
dokka-5a7e14eaaa4278343ff628c692d475be9732c94e.zip
Implement SourceSetMergingPageTransformer
Diffstat (limited to 'core/src/main/kotlin/model')
-rw-r--r--core/src/main/kotlin/model/properties/PropertyContainer.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/kotlin/model/properties/PropertyContainer.kt b/core/src/main/kotlin/model/properties/PropertyContainer.kt
index 6009bfe0..b14a30f5 100644
--- a/core/src/main/kotlin/model/properties/PropertyContainer.kt
+++ b/core/src/main/kotlin/model/properties/PropertyContainer.kt
@@ -26,6 +26,7 @@ class PropertyContainer<C : Any> internal constructor(
operator fun <D: Any> PropertyContainer<D>.plus(prop: ExtraProperty<D>?): PropertyContainer<D> =
if (prop == null) this else PropertyContainer(map + (prop.key to prop))
+
interface WithExtraProperties<C : Any> {
val extra: PropertyContainer<C>
@@ -57,4 +58,4 @@ fun <C> C.mergeExtras(left: C, right: C): C where C : Any, C : WithExtraProperti
val newExtras = PropertyContainer((unambiguous.flatten() + replaces).associateBy { it.key })
return needingFullMerge.fold(withNewExtras(newExtras)) { acc, merger -> merger(acc, left, right) }
-} \ No newline at end of file
+}