Merge branch 'dev-0.11.0'

1 files changed, 75 insertions, 0 deletions

diff --git a/core/src/main/kotlin/model/additionalExtras.kt b/core/src/main/kotlin/model/additionalExtras.kt
new file mode 100644
index 00000000..94d0e751
--- /dev/null
+++ b/core/src/main/kotlin/model/additionalExtras.kt
@@ -0,0 +1,75 @@
+package org.jetbrains.dokka.model
+
+import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.model.properties.ExtraProperty
+import org.jetbrains.dokka.model.properties.MergeStrategy
+
+class AdditionalModifiers(val content: SourceSetDependent<Set<ExtraModifiers>>) : ExtraProperty<Documentable> {
+    companion object : 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()
+    override val key: ExtraProperty.Key<Documentable, *> = AdditionalModifiers
+}
+
+fun SourceSetDependent<Set<ExtraModifiers>>.toAdditionalModifiers() = AdditionalModifiers(this)
+
+class Annotations(val content: SourceSetDependent<List<Annotation>>) : ExtraProperty<Documentable> {
+    companion object : ExtraProperty.Key<Documentable, Annotations> {
+        override fun mergeStrategyFor(left: Annotations, right: Annotations): MergeStrategy<Documentable> =
+            MergeStrategy.Replace(Annotations(left.content + right.content))
+    }
+
+    override val key: ExtraProperty.Key<Documentable, *> = Annotations
+
+    data class Annotation(val dri: DRI, val params: Map<String, AnnotationParameterValue>, val mustBeDocumented: Boolean = false) {
+        override fun equals(other: Any?): Boolean = when (other) {
+            is Annotation -> dri == other.dri
+            else -> false
+        }
+
+        override fun hashCode(): Int = dri.hashCode()
+    }
+}
+
+fun SourceSetDependent<List<Annotations.Annotation>>.toAnnotations() = Annotations(this)
+
+sealed class AnnotationParameterValue
+data class AnnotationValue(val annotation: Annotations.Annotation) : AnnotationParameterValue()
+data class ArrayValue(val value: List<AnnotationParameterValue>) : AnnotationParameterValue()
+data class EnumValue(val enumName: String, val enumDri: DRI) : AnnotationParameterValue()
+data class ClassValue(val className: String, val classDRI: DRI) : AnnotationParameterValue()
+data class StringValue(val value: String) : AnnotationParameterValue()
+
+
+object PrimaryConstructorExtra : ExtraProperty<DFunction>, ExtraProperty.Key<DFunction, PrimaryConstructorExtra> {
+    override val key: ExtraProperty.Key<DFunction, *> = this
+}
+
+data class ActualTypealias(val underlyingType: SourceSetDependent<Bound>) : ExtraProperty<DClasslike> {
+    companion object : ExtraProperty.Key<DClasslike, ActualTypealias> {
+        override fun mergeStrategyFor(
+            left: ActualTypealias,
+            right: ActualTypealias
+        ) =
+            MergeStrategy.Replace(ActualTypealias(left.underlyingType + right.underlyingType))
+    }
+
+    override val key: ExtraProperty.Key<DClasslike, ActualTypealias> = ActualTypealias
+}
+
+data class ConstructorValues(val values: SourceSetDependent<List<String>>) : ExtraProperty<DEnumEntry>{
+    companion object : ExtraProperty.Key<DEnumEntry, ConstructorValues> {
+        override fun mergeStrategyFor(left: ConstructorValues, right: ConstructorValues) =
+            MergeStrategy.Replace(ConstructorValues(left.values + right.values))
+    }
+
+    override val key: ExtraProperty.Key<DEnumEntry, ConstructorValues> = ConstructorValues
+}
\ No newline at end of file