Make enum entry constructor sourceset dependent

Kotlin · Jun 9, 2020 · 23e0d26 · 23e0d26
1 parent 435e34f
commit 23e0d26
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/core/src/main/kotlin/model/aditionalExtras.kt b/core/src/main/kotlin/model/aditionalExtras.kt
@@ -61,12 +61,10 @@ data class ActualTypealias(val underlyingType: SourceSetDependent<Bound>) : Extr
     override val key: ExtraProperty.Key<DClasslike, ActualTypealias> = ActualTypealias
 }
 
-data class ConstructorValues(val values: List<String>) : ExtraProperty<DEnumEntry>{
+data class ConstructorValues(val values: SourceSetDependent<List<String>>) : ExtraProperty<DEnumEntry>{
     companion object : ExtraProperty.Key<DEnumEntry, ConstructorValues> {
         override fun mergeStrategyFor(left: ConstructorValues, right: ConstructorValues) =
-            MergeStrategy.Fail{
-                throw IllegalArgumentException("Merging constructor parameters not applicable")
-            }
+            MergeStrategy.Replace(ConstructorValues(left.values + right.values))
     }
 
     override val key: ExtraProperty.Key<DEnumEntry, ConstructorValues> = ConstructorValues

diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
@@ -37,9 +37,9 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
             group(styles = setOf(TextStyle.Block)){
                 annotationsBlock(e)
                 link(e.name, e.dri, styles = emptySet())
-                e.extra[ConstructorValues]?.let {
-                    list(it.values, prefix = "(", suffix = ")"){
-                        text(it)
+                e.extra[ConstructorValues]?.let { constructorValues ->
+                    platformText(constructorValues.values, constructorValues.values.keys){
+                        it.joinToString(prefix = "(", postfix = ")")
                     }
                 }
             }

diff --git a/...base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/...base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -219,7 +219,7 @@ private class DokkaDescriptorVisitor(
             extra = PropertyContainer.withAll(
                 descriptor.additionalExtras(),
                 descriptor.getAnnotations(),
-                ConstructorValues(descriptor.getAppliedConstructorParameters())
+                ConstructorValues(descriptor.getAppliedConstructorParameters().toSourceSetDependent())
             )
         )
     }

diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -141,8 +141,10 @@ open class DefaultPageCreator(
     protected open fun contentForEnumEntry(e: DEnumEntry) = contentBuilder.contentFor(e) {
         group(kind = ContentKind.Cover) {
             header(1, e.name)
-            +buildSignature(e)
-            +contentForDescription(e)
+            sourceSetDependentHint(e.dri, e.sourceSets.toSet()) {
+                +buildSignature(e)
+                +contentForDescription(e)
+            }
         }
         group(styles = setOf(ContentStyle.TabbedContent)){
             +contentForComments(e)

diff --git a/plugins/base/src/test/kotlin/enums/EnumsTest.kt b/plugins/base/src/test/kotlin/enums/EnumsTest.kt
@@ -1,9 +1,6 @@
 package enums
 
-import matchers.content.assertNode
-import matchers.content.group
-import matchers.content.header
-import matchers.content.link
+import matchers.content.*
 import org.jetbrains.dokka.model.ConstructorValues
 import org.jetbrains.dokka.model.DEnum
 import org.jetbrains.dokka.pages.*
@@ -121,8 +118,8 @@ class EnumsTest : AbstractCoreTest() {
 
                         assertEquals(1, first.extra.allOfType<ConstructorValues>().size)
                         assertEquals(1, second.extra.allOfType<ConstructorValues>().size)
-                        assertEquals(listOf("\"e1\"", "1", "true"), first.extra.allOfType<ConstructorValues>().first().values)
-                        assertEquals(listOf("\"e2\"", "2", "false"), second.extra.allOfType<ConstructorValues>().first().values)
+                        assertEquals(listOf("\"e1\"", "1", "true"), first.extra.allOfType<ConstructorValues>().first().values.values.first())
+                        assertEquals(listOf("\"e2\"", "2", "false"), second.extra.allOfType<ConstructorValues>().first().values.values.first())
                     }
                 }
             }
@@ -171,7 +168,7 @@ class EnumsTest : AbstractCoreTest() {
                         val first = enum.entries.first()
 
                         assertEquals(1, first.extra.allOfType<ConstructorValues>().size)
-                        assertEquals(emptyList<String>(), first.extra.allOfType<ConstructorValues>().first().values)
+                        assertEquals(emptyList<String>(), first.extra.allOfType<ConstructorValues>().first().values.values.first())
                         assertNotNull(first.functions.find { it.name == "toBeImplemented" })
                     }
                 }
@@ -207,13 +204,16 @@ class EnumsTest : AbstractCoreTest() {
 
                 signature.assertNode {
                     header(1) { +"E1" }
-                    group {
-                        mapOf("SinceKotlin" to setOf("version")).entries.forEach {
-                            group {
+                    platformHinted {
+                        group {
+                            mapOf("SinceKotlin" to setOf("version")).entries.forEach {
                                 group {
-                                    unwrapAnnotation(it)
+                                    group {
+                                        unwrapAnnotation(it)
+                                    }
+                                    link { +"E1" }
+                                    +"()"
                                 }
-                                link { +"E1" }
                             }
                         }
                     }