diff options
| author | Paweł Marks <pmarks@virtuslab.com> | 2020-03-11 11:51:57 +0100 |
|---|---|---|
| committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-03-11 13:08:17 +0100 |
| commit | 11b223daa2c54d2b86efb5e6054fd7205ed0b37a (patch) | |
| tree | 0d84b5e330ed8f99316b9c63e6ed48b785ca1630 /core/src/main/kotlin/model | |
| parent | 39759708d2329f81008e66ff57c11898cd739246 (diff) | |
| download | dokka-11b223daa2c54d2b86efb5e6054fd7205ed0b37a.tar.gz dokka-11b223daa2c54d2b86efb5e6054fd7205ed0b37a.tar.bz2 dokka-11b223daa2c54d2b86efb5e6054fd7205ed0b37a.zip | |
Properly merge AdditionalModifiers from different platforms
Diffstat (limited to 'core/src/main/kotlin/model')
| -rw-r--r-- | core/src/main/kotlin/model/aditionalExtras.kt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/src/main/kotlin/model/aditionalExtras.kt b/core/src/main/kotlin/model/aditionalExtras.kt index 69e89a2a..d9587fe3 100644 --- a/core/src/main/kotlin/model/aditionalExtras.kt +++ b/core/src/main/kotlin/model/aditionalExtras.kt @@ -1,9 +1,15 @@ package org.jetbrains.dokka.model import org.jetbrains.dokka.model.properties.ExtraProperty +import org.jetbrains.dokka.model.properties.MergeStrategy -class AdditionalModifiers(val content: List<ExtraModifiers>) : ExtraProperty<Documentable> { - object AdditionalKey : ExtraProperty.Key<Documentable, AdditionalModifiers> +class AdditionalModifiers(val content: Set<ExtraModifiers>) : ExtraProperty<Documentable> { + object AdditionalKey : ExtraProperty.Key<Documentable, AdditionalModifiers> { + override fun mergeStrategyFor( + left: AdditionalModifiers, + right: AdditionalModifiers + ): MergeStrategy<Documentable> = MergeStrategy.Replace(AdditionalModifiers(left.content + right.content)) + } override fun equals(other: Any?): Boolean = if (other is AdditionalModifiers) other.content == content else false override fun hashCode() = content.hashCode() |