aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/kotlin
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/main/kotlin')
-rw-r--r--core/src/main/kotlin/model/aditionalExtras.kt10
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()