From e4044ec67ad90041b02bb84c4b966ffeac537617 Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Sun, 1 Mar 2020 21:26:13 +0100
Subject: Add initial version of Kotlin as Java plugin

---
 .../kotlin/converters/KotlinToJavaConverter.kt     | 246 +++++++++++++++++++++
 1 file changed, 246 insertions(+)
 create mode 100644 plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
new file mode 100644
index 00000000..19c4ef19
--- /dev/null
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -0,0 +1,246 @@
+package org.jetbrains.dokka.kotlinAsJava.converters
+
+import org.jetbrains.dokka.links.Callable
+import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.links.withClass
+import org.jetbrains.dokka.model.*
+import org.jetbrains.dokka.model.Annotation
+import org.jetbrains.dokka.model.Enum
+import org.jetbrains.dokka.model.Function
+import org.jetbrains.dokka.model.properties.PropertyContainer
+import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
+import org.jetbrains.kotlin.name.ClassId
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
+
+private fun <T : WithExpectActual> List<T>.groupedByLocation() =
+    map { it.sources to it }
+        .groupBy({ (location, _) ->
+            location.let { it.map.entries.first().value.path.split("/").last().split(".").first() + "Kt" } // TODO: first() does not look reasonable
+        }) { it.second }
+
+internal fun Package.asJava(): Package {
+    @Suppress("UNCHECKED_CAST")
+    val syntheticClasses = ((properties + functions) as List<WithExpectActual>)
+        .groupedByLocation()
+        .map { (syntheticClassName, nodes) ->
+            Class(
+                dri = dri.withClass(syntheticClassName),
+                name = syntheticClassName,
+                properties = nodes.filterIsInstance<Property>().map { it.asJava() },
+                constructors = emptyList(),
+                functions = (
+                        nodes.filterIsInstance<Property>().map { it.javaAccessors() } +
+                                nodes.filterIsInstance<Function>().map { it.asJava(syntheticClassName) }
+                        ) as List<Function>, // TODO: methods are static and receiver is a param
+                classlikes = emptyList(),
+                sources = PlatformDependent.empty(),
+                visibility = PlatformDependent.empty(), // TODO: fix this with the new visibility model -> public
+                companion = null,
+                generics = emptyList(),
+                supertypes = PlatformDependent.empty(),
+                documentation = PlatformDependent.empty(),
+                modifier = WithAbstraction.Modifier.Final,
+                platformData = platformData,
+                extra = PropertyContainer.empty()
+            )
+        }
+
+    return copy(
+        functions = emptyList(),
+        properties = emptyList(),
+        classlikes = classlikes.map { it.asJava() } + syntheticClasses,
+        packages = packages.map { it.asJava() }
+    )
+}
+
+internal fun Property.asJava(isTopLevel: Boolean = false, relocateToClass: String? = null) =
+    copy(
+        dri = if (relocateToClass.isNullOrBlank()) {
+            dri
+        } else {
+            dri.withClass(relocateToClass)
+        },
+        modifier = if (setter == null) {
+            WithAbstraction.Modifier.Final
+        } else {
+            WithAbstraction.Modifier.Empty
+        },
+        type = type.asJava(isTopLevel), // TODO: check,
+        setter = null,
+        getter = null // Removing getters and setters as they will be available as functions
+    ) // TODO: visibility -> always private; if (isTopLevel) -> static
+
+internal fun Property.javaAccessors(isTopLevel: Boolean = false, relocateToClass: String? = null): List<Function> =
+    listOfNotNull(
+        getter?.copy(
+            dri = if (relocateToClass.isNullOrBlank()) {
+                dri
+            } else {
+                dri.withClass(relocateToClass)
+            },
+            name = "get" + name.capitalize(),
+            modifier = if (setter == null) {
+                WithAbstraction.Modifier.Final
+            } else {
+                WithAbstraction.Modifier.Empty
+            },
+            type = type.asJava(isTopLevel) // TODO: check,
+        ),
+        setter?.copy(
+            dri = if (relocateToClass.isNullOrBlank()) {
+                dri
+            } else {
+                dri.withClass(relocateToClass)
+            },
+            name = "set" + name.capitalize(),
+            modifier = if (setter == null) {
+                WithAbstraction.Modifier.Final
+            } else {
+                WithAbstraction.Modifier.Empty
+            },
+            type = type.asJava(isTopLevel) // TODO: check,
+        )
+    ) // TODO: if (isTopLevel) -> static; visibility -> always? public
+
+
+internal fun Function.asJava(containingClassName: String): Function {
+    val newName = when {
+        isConstructor -> containingClassName
+        else -> name
+    }
+    return copy(
+//        dri = dri.copy(callable = dri.callable?.asJava()),
+        name = newName,
+        type = type.asJava(),
+        parameters = parameters.map { it.asJava() }
+    ) // TODO: should receiver be the first param?
+}
+
+internal fun Classlike.asJava(): Classlike = when (this) {
+    is Class -> asJava()
+    is Enum -> asJava()
+    is Annotation -> asJava()
+    is Object -> asJava()
+    is Interface -> asJava()
+    else -> throw IllegalArgumentException("$this shouldn't be here")
+}
+
+internal fun Class.asJava(): Class = copy(
+    constructors = constructors.map { it.asJava(name) },
+    functions = (functions + properties.map { it.getter } + properties.map { it.setter }).filterNotNull().map {
+        it.asJava(
+            name
+        )
+    },
+    properties = properties.map { it.asJava() },
+    classlikes = classlikes.map { it.asJava() }
+) // TODO: if modifier is from Kotlin, then Empty -> Final I think, Java ones stay the same
+
+internal fun Enum.asJava(): Enum = copy(
+    constructors = constructors.map { it.asJava(name) },
+    functions = (functions + properties.map { it.getter } + properties.map { it.setter }).filterNotNull().map {
+        it.asJava(
+            name
+        )
+    },
+    properties = properties.map { it.asJava() },
+    classlikes = classlikes.map { it.asJava() }
+//    , entries = entries.map { it.asJava() }
+) // TODO: if modifier is from Kotlin, then Empty -> Final I think, Java ones stay the same
+
+internal fun Object.asJava(): Object = copy(
+    functions = (functions + properties.map { it.getter } + properties.map { it.setter })
+        .filterNotNull()
+        .map { it.asJava(name.orEmpty()) },
+    properties = properties.map { it.asJava() } +
+            Property(
+                name = "INSTANCE",
+                modifier = WithAbstraction.Modifier.Final,
+                dri = dri.copy(callable = Callable("INSTANCE", null, emptyList())),
+                documentation = PlatformDependent.empty(),
+                sources = PlatformDependent.empty(),
+                visibility = PlatformDependent.empty(), // TODO: public and static
+                type = JavaTypeWrapper(
+                    dri.packageName?.split(".").orEmpty() +
+                            dri.classNames?.split(".").orEmpty(),
+                    emptyList(),
+                    dri,
+                    false
+                ),
+                setter = null,
+                getter = null,
+                platformData = platformData,
+                receiver = null
+            ),
+    classlikes = classlikes.map { it.asJava() }
+)
+
+internal fun Interface.asJava(): Interface = copy(
+    functions = (functions + properties.map { it.getter } + properties.map { it.setter })
+        .filterNotNull()
+        .map { it.asJava(name) },
+    properties = emptyList(),
+    classlikes = classlikes.map { it.asJava() } // TODO: public static final class DefaultImpls with impls for methods (killme please)
+)
+
+internal fun Annotation.asJava(): Annotation = copy(
+    properties = properties.map { it.asJava() },
+    constructors = emptyList(),
+    classlikes = classlikes.map { it.asJava() }
+) // TODO investigate if annotation class can have methods and properties not from constructor
+
+internal fun Parameter.asJava(): Parameter = copy(
+    type = type.asJava()
+)
+
+internal fun String.getAsPrimitive(): JvmPrimitiveType? = org.jetbrains.kotlin.builtins.PrimitiveType.values()
+    .find { it.typeFqName.asString() == this }
+    ?.let { JvmPrimitiveType.get(it) }
+
+internal fun TypeWrapper.getAsType(classId: ClassId, fqName: String, top: Boolean): TypeWrapper {
+    val fqNameSplit = fqName
+        .takeIf { top }
+        ?.getAsPrimitive()
+        ?.name?.toLowerCase()
+        ?.let(::listOf)
+        ?: classId.asString().split("/")
+
+    return JavaTypeWrapper(
+        fqNameSplit,
+        arguments.map { it.asJava(false) },
+        classId.toDRI(dri),
+        fqNameSplit.last()[0].isLowerCase()
+    )
+}
+
+internal fun TypeWrapper.asJava(top: Boolean = true): TypeWrapper = constructorFqName
+    ?.takeUnless { it.endsWith(".Unit") } // TODO: ???
+    ?.let { fqName -> fqName.mapToJava()?.let { getAsType(it, fqName, top) } } ?: this
+
+
+private fun String.mapToJava(): ClassId? =
+    JavaToKotlinClassMap.mapKotlinToJava(FqName(this).toUnsafe())
+
+internal fun ClassId.toDRI(dri: DRI?): DRI = DRI(
+    packageName = packageFqName.asString(),
+    classNames = classNames(),
+    callable = dri?.callable,//?.asJava(), TODO: ????
+    extra = null,
+    target = null
+)
+
+internal fun ClassId.classNames(): String =
+    shortClassName.identifier + (outerClassId?.classNames()?.let { ".$it" } ?: "")
+
+//fun TypeConstructor.asJava(): TypeReference =
+//    fullyQualifiedName.mapToJava()
+//        ?.let { tc.copy(fullyQualifiedName = it.asString(), params = tc.params.map { it.asJava() }) } ?: tc
+
+//fun TypeParam.asJava(): TypeReference = copy(bounds = bounds.map { it.asJava() })
+
+//fun TypeReference.asJava(): TypeReference = when (this) {
+//    is TypeConstructor -> asJava()
+//    is TypeParam -> asJava()
+//    else -> this
+//}
\ No newline at end of file
-- 
cgit 


From 8ea1e6752aadc7da2bd9e1fff7f4040d16e3d864 Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Tue, 3 Mar 2020 19:56:07 +0100
Subject: Improve JavaSignatureProvider

---
 .../src/main/kotlin/JavaSignatureProvider.kt       | 42 +++++++++++++---------
 .../kotlin/converters/KotlinToJavaConverter.kt     | 11 +++---
 2 files changed, 31 insertions(+), 22 deletions(-)

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/plugins/kotlin-as-java/src/main/kotlin/JavaSignatureProvider.kt b/plugins/kotlin-as-java/src/main/kotlin/JavaSignatureProvider.kt
index 526546f2..6a6acf6d 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/JavaSignatureProvider.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/JavaSignatureProvider.kt
@@ -15,7 +15,7 @@ import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.utilities.DokkaLogger
 
 class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogger) : SignatureProvider {
-    private val contentBuilder = PageContentBuilder(ctcc, logger)
+    private val contentBuilder = PageContentBuilder(ctcc, this, logger)
 
     override fun signature(documentable: Documentable): List<ContentNode> = when (documentable) {
         is Function -> signature(documentable)
@@ -30,9 +30,8 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
     private fun signature(c: Classlike) = c.platformData.map { signature(c, it) }.distinct()
 
     private fun signature(c: Classlike, platform: PlatformData) = contentBuilder.contentFor(c, ContentKind.Symbol) {
-        text(c.visibility[platform]?.externalDisplayName ?: "")
         if (c is Class) {
-            text(c.modifier.toString())
+            text(c.modifier.takeIf { it != WithAbstraction.Modifier.Empty }?.toString()?.toLowerCase().orEmpty())
         }
         when (c) {
             is Class -> text(" class ")
@@ -42,19 +41,27 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
             is Annotation -> text(" @interface ")
         }
         text(c.name!!)
-        if (c is WithSupertypes) {
-            list(c.supertypes.getValue(platform), prefix = " : ") {
+        if (c is WithGenerics) {
+            val generics = c.generics.filterOnPlatform(platform)
+            if (generics.isNotEmpty()) {
+                text("<")
+                list(generics) {
+                    +this@JavaSignatureProvider.signature(it)
+                }
+                text(">")
+            }
+        }
+        if (c is WithSupertypes && c.supertypes.containsKey(platform)) {
+            list(c.supertypes.getValue(platform), prefix = " extends ") {
                 link(it.sureClassNames, it)
             }
         }
     }
 
     private fun signature(f: Function, platform: PlatformData) = contentBuilder.contentFor(f, ContentKind.Symbol) {
-        text(f.visibility[platform]?.externalDisplayName ?: "")
-        text(f.modifier.toString())
+        text(f.modifier.takeIf { it != WithAbstraction.Modifier.Empty }?.toString()?.toLowerCase().orEmpty())
         val returnType = f.type
         if (!f.isConstructor && returnType.constructorFqName != Unit::class.qualifiedName) {
-            text(": ")
             type(returnType)
         }
         text("  ")
@@ -63,28 +70,26 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
         if (generics.isNotEmpty()) {
             text("<")
             generics.forEach {
-                signature(it)
+                this@JavaSignatureProvider.signature(it)
             }
             text(">")
         }
         text("(")
-        list(listOfNotNull(f.receiver) + f.parameters.filterOnPlatform(platform)) {
+        list(f.parameters.filterOnPlatform(platform)) {
             type(it.type)
             text(" ")
             link(it.name!!, it.dri)
-            text(", ")
         }
         text(")")
     }
 
     private fun signature(t: TypeParameter) = contentBuilder.contentFor(t, ContentKind.Symbol) {
-        link(t.name, t.dri)
+        text(t.name.substringAfterLast("."))
         if (t.bounds.isNotEmpty()) {
-            text("<")
+            text(" extends ")
             t.bounds.forEach {
-                signature(it, t.dri, t.platformData)
+                +signature(it, t.dri, t.platformData)
             }
-            text(">")
         }
     }
 
@@ -93,13 +98,16 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
 
         is TypeConstructor -> contentBuilder.contentFor(dri, platforms.toSet()) {
             link(p.dri.classNames.orEmpty(), p.dri)
-        }.children + p.projections.flatMap { signature(it, dri, platforms) }
+            list(p.projections, prefix = "<", suffix = ">") {
+                +signature(it, dri, platforms)
+            }
+        }.children
 
         is Variance -> contentBuilder.contentFor(dri, platforms.toSet()) {
             text(p.kind.toString() + " ")
         }.children + signature(p.inner, dri, platforms)
 
-        is Star -> contentBuilder.contentFor(dri, platforms.toSet()) { text("*") }.children
+        is Star -> contentBuilder.contentFor(dri, platforms.toSet()) { text("?") }.children
 
         is Nullable -> signature(p.inner, dri, platforms) + contentBuilder.contentFor(
             dri,
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index 19c4ef19..f7fc57ff 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -61,6 +61,7 @@ internal fun Property.asJava(isTopLevel: Boolean = false, relocateToClass: Strin
         } else {
             dri.withClass(relocateToClass)
         },
+//        name = name.o,
         modifier = if (setter == null) {
             WithAbstraction.Modifier.Final
         } else {
@@ -113,7 +114,8 @@ internal fun Function.asJava(containingClassName: String): Function {
 //        dri = dri.copy(callable = dri.callable?.asJava()),
         name = newName,
         type = type.asJava(),
-        parameters = parameters.map { it.asJava() }
+        parameters = listOfNotNull(receiver?.asJava()) + parameters.map { it.asJava() },
+        receiver = null
     ) // TODO: should receiver be the first param?
 }
 
@@ -129,9 +131,7 @@ internal fun Classlike.asJava(): Classlike = when (this) {
 internal fun Class.asJava(): Class = copy(
     constructors = constructors.map { it.asJava(name) },
     functions = (functions + properties.map { it.getter } + properties.map { it.setter }).filterNotNull().map {
-        it.asJava(
-            name
-        )
+        it.asJava(name)
     },
     properties = properties.map { it.asJava() },
     classlikes = classlikes.map { it.asJava() }
@@ -191,7 +191,8 @@ internal fun Annotation.asJava(): Annotation = copy(
 ) // TODO investigate if annotation class can have methods and properties not from constructor
 
 internal fun Parameter.asJava(): Parameter = copy(
-    type = type.asJava()
+    type = type.asJava(),
+    name = if (name.isNullOrBlank()) "\$self" else name
 )
 
 internal fun String.getAsPrimitive(): JvmPrimitiveType? = org.jetbrains.kotlin.builtins.PrimitiveType.values()
-- 
cgit 


From ea0945efe8c7b5dd9aabc4f049afaac612b70422 Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Wed, 4 Mar 2020 16:50:40 +0100
Subject: Fix some DRI translations

---
 .../kotlin/signatures/KotlinSignatureProvider.kt   |  7 --
 .../documentables/PageContentBuilder.kt            |  9 +++
 .../src/main/kotlin/JavaSignatureProvider.kt       | 88 ++++++++++------------
 .../kotlin/converters/KotlinToJavaConverter.kt     | 81 ++++++++++++++++----
 4 files changed, 114 insertions(+), 71 deletions(-)

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
index cfca20b0..97445b2b 100644
--- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
+++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
@@ -104,10 +104,3 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
         }
     }
 }
-
-private fun <T> PageContentBuilder.DocumentableContentBuilder.platformText(
-    value: PlatformDependent<T>,
-    transform: (T) -> String
-) = value.entries.forEach { (p, v) ->
-    transform(v).takeIf { it.isNotBlank() }?.also { text(it, platformData = setOf(p)) }
-}
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
index ef1b8ec1..b9e20919 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
@@ -4,6 +4,7 @@ import org.jetbrains.dokka.base.signatures.SignatureProvider
 import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.model.Documentable
+import org.jetbrains.dokka.model.PlatformDependent
 import org.jetbrains.dokka.model.TypeWrapper
 import org.jetbrains.dokka.model.doc.DocTag
 import org.jetbrains.dokka.model.properties.PropertyContainer
@@ -264,5 +265,13 @@ open class PageContentBuilder(
                 type(it)
             }
         }
+
+
+        fun <T> platformText(
+            value: PlatformDependent<T>,
+            transform: (T) -> String
+        ) = value.entries.forEach { (p, v) ->
+            transform(v).takeIf { it.isNotBlank() }?.also { text(it, platformData = setOf(p)) }
+        }
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin-as-java/src/main/kotlin/JavaSignatureProvider.kt b/plugins/kotlin-as-java/src/main/kotlin/JavaSignatureProvider.kt
index 2e3ec152..8e2c783e 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/JavaSignatureProvider.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/JavaSignatureProvider.kt
@@ -3,7 +3,6 @@ package org.jetbrains.dokka.kotlinAsJava
 import org.jetbrains.dokka.base.signatures.SignatureProvider
 import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
 import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
-import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.links.sureClassNames
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.Annotation
@@ -17,48 +16,50 @@ import org.jetbrains.dokka.utilities.DokkaLogger
 class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogger) : SignatureProvider {
     private val contentBuilder = PageContentBuilder(ctcc, this, logger)
 
-    override fun signature(documentable: Documentable): List<ContentNode> = when (documentable) {
+    private val ignoredVisibilities = setOf(JavaVisibility.Default, KotlinVisibility.Public)
+    private val ignoredModifiers =
+        setOf(WithAbstraction.Modifier.Open, WithAbstraction.Modifier.Empty, WithAbstraction.Modifier.Sealed)
+
+
+    override fun signature(documentable: Documentable): ContentNode = when (documentable) {
         is Function -> signature(documentable)
         is Classlike -> signature(documentable)
+        is TypeParameter -> signature(documentable)
         else -> throw NotImplementedError(
             "Cannot generate signature for ${documentable::class.qualifiedName} ${documentable.name}"
         )
     }
 
-    private fun signature(f: Function) = f.platformData.map { signature(f, it) }.distinct()
-
-    private fun signature(c: Classlike) = c.platformData.map { signature(c, it) }.distinct()
+    private fun signature(c: Classlike) = contentBuilder.contentFor(c, ContentKind.Symbol) {
+        platformText(c.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
 
-    private fun signature(c: Classlike, platform: PlatformData) = contentBuilder.contentFor(c, ContentKind.Symbol) {
         if (c is Class) {
-            text(c.modifier.takeIf { it != WithAbstraction.Modifier.Empty }?.toString()?.toLowerCase().orEmpty())
+            text(c.modifier.takeIf { it !in ignoredModifiers }?.toString()?.toLowerCase().orEmpty() + " ")
         }
+
         when (c) {
-            is Class -> text(" class ")
-            is Interface -> text(" interface ")
-            is Enum -> text(" enum ")
-            is Object -> text(" class ")
-            is Annotation -> text(" @interface ")
+            is Class -> text("class ")
+            is Interface -> text("interface ")
+            is Enum -> text("enum ")
+            is Object -> text("class ")
+            is Annotation -> text("@interface ")
         }
         text(c.name!!)
         if (c is WithGenerics) {
-            val generics = c.generics.filterOnPlatform(platform)
-            if (generics.isNotEmpty()) {
-                text("<")
-                list(generics) {
-                    +this@JavaSignatureProvider.signature(it)
-                }
-                text(">")
+            list(c.generics, prefix = "<", suffix = ">") {
+                +buildSignature(it)
             }
         }
-        if (c is WithSupertypes && c.supertypes.containsKey(platform)) {
-            list(c.supertypes.getValue(platform), prefix = " extends ") {
-                link(it.sureClassNames, it)
+        if (c is WithSupertypes) {
+            c.supertypes.map { (p, dris) ->
+                list(dris, prefix = " extends ", platformData = setOf(p)) {
+                    link(it.sureClassNames, it, platformData = setOf(p))
+                }
             }
         }
     }
 
-    private fun signature(f: Function, platform: PlatformData) = contentBuilder.contentFor(f, ContentKind.Symbol) {
+    private fun signature(f: Function) = contentBuilder.contentFor(f, ContentKind.Symbol) {
         text(f.modifier.takeIf { it != WithAbstraction.Modifier.Empty }?.toString()?.toLowerCase().orEmpty() + " ")
         val returnType = f.type
         if (!f.isConstructor && returnType.constructorFqName != Unit::class.qualifiedName) {
@@ -66,16 +67,11 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
         }
         text("  ")
         link(f.name, f.dri)
-        val generics = f.generics.filterOnPlatform(platform)
-        if (generics.isNotEmpty()) {
-            text("<")
-            generics.forEach {
-                this@JavaSignatureProvider.signature(it)
-            }
-            text(">")
+        list(f.generics, prefix = "<", suffix = ">") {
+            +buildSignature(it)
         }
         text("(")
-        list(f.parameters.filterOnPlatform(platform)) {
+        list(f.parameters) {
             type(it.type)
             text(" ")
             link(it.name!!, it.dri)
@@ -85,34 +81,30 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
 
     private fun signature(t: TypeParameter) = contentBuilder.contentFor(t, ContentKind.Symbol) {
         text(t.name.substringAfterLast("."))
-        if (t.bounds.isNotEmpty()) {
-            text(" extends ")
-            t.bounds.forEach {
-                +signature(it, t.dri, t.platformData)
-            }
+        list(t.bounds, prefix = " extends ") {
+            signatureForProjection(it)
         }
     }
 
-    private fun signature(p: Projection, dri: DRI, platforms: List<PlatformData>): List<ContentNode> = when (p) {
-        is OtherParameter -> contentBuilder.contentFor(dri, platforms.toSet()) { text(p.name) }.children
 
-        is TypeConstructor -> contentBuilder.contentFor(dri, platforms.toSet()) {
+    private fun PageContentBuilder.DocumentableContentBuilder.signatureForProjection(p: Projection): Unit = when (p) {
+        is OtherParameter -> text(p.name)
+
+        is TypeConstructor -> group {
             link(p.dri.classNames.orEmpty(), p.dri)
             list(p.projections, prefix = "<", suffix = ">") {
-                +signature(it, dri, platforms)
+                signatureForProjection(it)
             }
-        }.children
+        }
 
-        is Variance -> contentBuilder.contentFor(dri, platforms.toSet()) {
+        is Variance -> group {
             text(p.kind.toString() + " ")
-        }.children + signature(p.inner, dri, platforms)
+            signatureForProjection(p.inner)
+        }
 
-        is Star -> contentBuilder.contentFor(dri, platforms.toSet()) { text("?") }.children
+        is Star -> text("?")
 
-        is Nullable -> signature(p.inner, dri, platforms) + contentBuilder.contentFor(
-            dri,
-            platforms.toSet()
-        ) { text("?") }.children
+        is Nullable -> signatureForProjection(p.inner)
     }
 
     private fun <T : Documentable> Collection<T>.filterOnPlatform(platformData: PlatformData) =
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index f7fc57ff..a8b45db0 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -16,7 +16,9 @@ import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
 private fun <T : WithExpectActual> List<T>.groupedByLocation() =
     map { it.sources to it }
         .groupBy({ (location, _) ->
-            location.let { it.map.entries.first().value.path.split("/").last().split(".").first() + "Kt" } // TODO: first() does not look reasonable
+            location.let {
+                it.map.entries.first().value.path.split("/").last().split(".").first() + "Kt"
+            } // TODO: first() does not look reasonable
         }) { it.second }
 
 internal fun Package.asJava(): Package {
@@ -61,16 +63,19 @@ internal fun Property.asJava(isTopLevel: Boolean = false, relocateToClass: Strin
         } else {
             dri.withClass(relocateToClass)
         },
-//        name = name.o,
         modifier = if (setter == null) {
             WithAbstraction.Modifier.Final
         } else {
             WithAbstraction.Modifier.Empty
         },
-        type = type.asJava(isTopLevel), // TODO: check,
+        visibility = visibility.copy(
+            map = visibility.mapValues { JavaVisibility.Private }
+        ),
+        type = type.asJava(isTopLevel), // TODO: check
         setter = null,
-        getter = null // Removing getters and setters as they will be available as functions
-    ) // TODO: visibility -> always private; if (isTopLevel) -> static
+        getter = null, // Removing getters and setters as they will be available as functions
+        extra = if (isTopLevel) extra.plus(extra.mergeAdditionalModifiers(listOf(ExtraModifiers.STATIC))) else extra
+    )
 
 internal fun Property.javaAccessors(isTopLevel: Boolean = false, relocateToClass: String? = null): List<Function> =
     listOfNotNull(
@@ -86,7 +91,11 @@ internal fun Property.javaAccessors(isTopLevel: Boolean = false, relocateToClass
             } else {
                 WithAbstraction.Modifier.Empty
             },
-            type = type.asJava(isTopLevel) // TODO: check,
+            visibility = visibility.copy(
+                map = visibility.mapValues { JavaVisibility.Public }
+            ),
+            type = type.asJava(isTopLevel), // TODO: check
+            extra = if (isTopLevel) getter!!.extra.plus(getter!!.extra.mergeAdditionalModifiers(listOf(ExtraModifiers.STATIC))) else getter!!.extra
         ),
         setter?.copy(
             dri = if (relocateToClass.isNullOrBlank()) {
@@ -100,9 +109,13 @@ internal fun Property.javaAccessors(isTopLevel: Boolean = false, relocateToClass
             } else {
                 WithAbstraction.Modifier.Empty
             },
-            type = type.asJava(isTopLevel) // TODO: check,
+            visibility = visibility.copy(
+                map = visibility.mapValues { JavaVisibility.Public }
+            ),
+            type = type.asJava(isTopLevel), // TODO: check
+            extra = if (isTopLevel) setter!!.extra.plus(setter!!.extra.mergeAdditionalModifiers(listOf(ExtraModifiers.STATIC))) else setter!!.extra
         )
-    ) // TODO: if (isTopLevel) -> static; visibility -> always? public
+    )
 
 
 internal fun Function.asJava(containingClassName: String): Function {
@@ -134,18 +147,38 @@ internal fun Class.asJava(): Class = copy(
         it.asJava(name)
     },
     properties = properties.map { it.asJava() },
-    classlikes = classlikes.map { it.asJava() }
+    classlikes = classlikes.map { it.asJava() },
+    generics = generics.map { it.asJava() },
+    supertypes = supertypes.copy(
+        map = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
+    )
 ) // TODO: if modifier is from Kotlin, then Empty -> Final I think, Java ones stay the same
 
+private fun TypeParameter.asJava(): TypeParameter = copy(
+    dri = dri.possiblyAsJava(),
+    bounds = bounds.map { it.asJava() }
+)
+
+private fun Bound.asJava(): Bound = when (this) {
+    is TypeConstructor -> copy(
+        dri = dri.possiblyAsJava()
+    )
+    is Nullable -> copy(
+        inner = inner.asJava()
+    )
+    else -> this
+}
+
 internal fun Enum.asJava(): Enum = copy(
     constructors = constructors.map { it.asJava(name) },
     functions = (functions + properties.map { it.getter } + properties.map { it.setter }).filterNotNull().map {
-        it.asJava(
-            name
-        )
+        it.asJava(name)
     },
     properties = properties.map { it.asJava() },
-    classlikes = classlikes.map { it.asJava() }
+    classlikes = classlikes.map { it.asJava() },
+    supertypes = supertypes.copy(
+        map = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
+    )
 //    , entries = entries.map { it.asJava() }
 ) // TODO: if modifier is from Kotlin, then Empty -> Final I think, Java ones stay the same
 
@@ -173,7 +206,10 @@ internal fun Object.asJava(): Object = copy(
                 platformData = platformData,
                 receiver = null
             ),
-    classlikes = classlikes.map { it.asJava() }
+    classlikes = classlikes.map { it.asJava() },
+    supertypes = supertypes.copy(
+        map = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
+    )
 )
 
 internal fun Interface.asJava(): Interface = copy(
@@ -181,7 +217,11 @@ internal fun Interface.asJava(): Interface = copy(
         .filterNotNull()
         .map { it.asJava(name) },
     properties = emptyList(),
-    classlikes = classlikes.map { it.asJava() } // TODO: public static final class DefaultImpls with impls for methods (killme please)
+    classlikes = classlikes.map { it.asJava() }, // TODO: public static final class DefaultImpls with impls for methods
+    generics = generics.map { it.asJava() },
+    supertypes = supertypes.copy(
+        map = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
+    )
 )
 
 internal fun Annotation.asJava(): Annotation = copy(
@@ -215,8 +255,11 @@ internal fun TypeWrapper.getAsType(classId: ClassId, fqName: String, top: Boolea
     )
 }
 
+private fun DRI.partialFqName() = packageName?.let { "$it." } + classNames
+private fun DRI.possiblyAsJava() = this.partialFqName().mapToJava()?.toDRI(this) ?: this
+
 internal fun TypeWrapper.asJava(top: Boolean = true): TypeWrapper = constructorFqName
-    ?.takeUnless { it.endsWith(".Unit") } // TODO: ???
+//    ?.takeUnless { it.endsWith(".Unit") } // TODO: ???
     ?.let { fqName -> fqName.mapToJava()?.let { getAsType(it, fqName, top) } } ?: this
 
 
@@ -231,6 +274,12 @@ internal fun ClassId.toDRI(dri: DRI?): DRI = DRI(
     target = null
 )
 
+private fun PropertyContainer<out Documentable>.mergeAdditionalModifiers(second: List<ExtraModifiers>) =
+    this[AdditionalModifiers.AdditionalKey]?.squash(AdditionalModifiers(second)) ?: AdditionalModifiers(second)
+
+private fun AdditionalModifiers.squash(second: AdditionalModifiers) =
+    AdditionalModifiers((content + second.content).distinct())
+
 internal fun ClassId.classNames(): String =
     shortClassName.identifier + (outerClassId?.classNames()?.let { ".$it" } ?: "")
 
-- 
cgit 


From fc875fe5f8bc52ac75053db097b3349465705732 Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Wed, 4 Mar 2020 17:04:50 +0100
Subject: Refactor Modifiers

---
 core/src/main/kotlin/model/Documentable.kt         | 25 +++++++++++++-----
 .../kotlin/signatures/KotlinSignatureProvider.kt   |  4 +--
 .../DefaultDescriptorToDocumentableTranslator.kt   | 10 ++++----
 .../psi/DefaultPsiToDocumentableTranslator.kt      |  6 ++---
 .../src/main/kotlin/JavaSignatureProvider.kt       |  6 ++---
 .../kotlin/converters/KotlinToJavaConverter.kt     | 30 +++++++---------------
 6 files changed, 40 insertions(+), 41 deletions(-)

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/core/src/main/kotlin/model/Documentable.kt b/core/src/main/kotlin/model/Documentable.kt
index 9116b6e6..d073d39a 100644
--- a/core/src/main/kotlin/model/Documentable.kt
+++ b/core/src/main/kotlin/model/Documentable.kt
@@ -73,10 +73,21 @@ interface WithType {
 
 interface WithAbstraction {
     val modifier: Modifier
+}
 
-    enum class Modifier {
-        Abstract, Open, Final, Sealed, Empty
-    }
+sealed class Modifier(val name: String)
+sealed class KotlinModifier(name: String) : Modifier(name) {
+    object Abstract : KotlinModifier("abstract")
+    object Open : KotlinModifier("open")
+    object Final : KotlinModifier("final")
+    object Sealed : KotlinModifier("sealed")
+    object Empty : KotlinModifier("")
+}
+
+sealed class JavaModifier(name: String) : Modifier(name) {
+    object Abstract : JavaModifier("abstract")
+    object Final : JavaModifier("final")
+    object Empty : JavaModifier("")
 }
 
 interface WithCompanion {
@@ -145,7 +156,7 @@ data class Class(
     override val generics: List<TypeParameter>,
     override val supertypes: PlatformDependent<List<DRI>>,
     override val documentation: PlatformDependent<DocumentationNode>,
-    override val modifier: WithAbstraction.Modifier,
+    override val modifier: Modifier,
     override val platformData: List<PlatformData>,
     override val extra: PropertyContainer<Class> = PropertyContainer.empty()
 ) : Classlike(), WithAbstraction, WithCompanion, WithConstructors, WithGenerics, WithSupertypes,
@@ -206,7 +217,7 @@ data class Function(
     override val type: TypeWrapper,
     override val generics: List<TypeParameter>,
     override val receiver: Parameter?,
-    override val modifier: WithAbstraction.Modifier,
+    override val modifier: Modifier,
     override val platformData: List<PlatformData>,
     override val extra: PropertyContainer<Function> = PropertyContainer.empty()
 ) : Documentable(), Callable, WithGenerics, WithExtraProperties<Function> {
@@ -286,7 +297,7 @@ data class Property(
     override val receiver: Parameter?,
     val setter: Function?,
     val getter: Function?,
-    override val modifier: WithAbstraction.Modifier,
+    override val modifier: Modifier,
     override val platformData: List<PlatformData>,
     override val extra: PropertyContainer<Property> = PropertyContainer.empty()
 ) : Documentable(), Callable, WithExtraProperties<Property> {
@@ -331,7 +342,7 @@ data class OtherParameter(val name: String) : Bound()
 object Star : Projection()
 data class TypeConstructor(val dri: DRI, val projections: List<Projection>) : Bound()
 data class Nullable(val inner: Bound) : Bound()
-data class Variance(val kind: Kind, val inner: Bound): Projection() {
+data class Variance(val kind: Kind, val inner: Bound) : Projection() {
     enum class Kind { In, Out }
 }
 
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
index 97445b2b..c8a5105d 100644
--- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
+++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
@@ -29,7 +29,7 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
     private fun signature(c: Classlike) = contentBuilder.contentFor(c, ContentKind.Symbol) {
         platformText(c.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
         if (c is Class) {
-            text(c.modifier.toString() + " ")
+            text(c.modifier.name + " ")
         }
         when (c) {
             is Class -> text("class ")
@@ -50,7 +50,7 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
 
     private fun signature(f: Function) = contentBuilder.contentFor(f, ContentKind.Symbol) {
         platformText(f.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
-        text(f.modifier.toString().toLowerCase() + " ")
+        text(f.modifier.name + " ")
         text("fun ")
         f.receiver?.also {
             type(it.type)
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index f30ffa00..29441ac1 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -434,11 +434,11 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
     }
 
     fun MemberDescriptor.modifier() = when (modality) {
-        Modality.FINAL -> WithAbstraction.Modifier.Final
-        Modality.SEALED -> WithAbstraction.Modifier.Sealed
-        Modality.OPEN -> WithAbstraction.Modifier.Open
-        Modality.ABSTRACT -> WithAbstraction.Modifier.Abstract
-        else -> WithAbstraction.Modifier.Empty
+        Modality.FINAL -> KotlinModifier.Final
+        Modality.SEALED -> KotlinModifier.Sealed
+        Modality.OPEN -> KotlinModifier.Open
+        Modality.ABSTRACT -> KotlinModifier.Abstract
+        else -> KotlinModifier.Empty
     }
 
     private fun MemberDescriptor.createSources(): PlatformDependent<DocumentableSource> = if (isExpect()) {
diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
index 6b25639f..81de12eb 100644
--- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
@@ -243,9 +243,9 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
         }
 
         private fun PsiModifierListOwner.getModifier() = when {
-            hasModifier(JvmModifier.ABSTRACT) -> WithAbstraction.Modifier.Abstract
-            hasModifier(JvmModifier.FINAL) -> WithAbstraction.Modifier.Final
-            else -> WithAbstraction.Modifier.Empty
+            hasModifier(JvmModifier.ABSTRACT) -> JavaModifier.Abstract
+            hasModifier(JvmModifier.FINAL) -> JavaModifier.Final
+            else -> JavaModifier.Empty
         }
 
         private fun PsiTypeParameterListOwner.mapTypeParameters(dri: DRI): List<TypeParameter> {
diff --git a/plugins/kotlin-as-java/src/main/kotlin/JavaSignatureProvider.kt b/plugins/kotlin-as-java/src/main/kotlin/JavaSignatureProvider.kt
index 8e2c783e..06224a7a 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/JavaSignatureProvider.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/JavaSignatureProvider.kt
@@ -18,7 +18,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
 
     private val ignoredVisibilities = setOf(JavaVisibility.Default, KotlinVisibility.Public)
     private val ignoredModifiers =
-        setOf(WithAbstraction.Modifier.Open, WithAbstraction.Modifier.Empty, WithAbstraction.Modifier.Sealed)
+        setOf(KotlinModifier.Open, JavaModifier.Empty, KotlinModifier.Empty, KotlinModifier.Sealed)
 
 
     override fun signature(documentable: Documentable): ContentNode = when (documentable) {
@@ -34,7 +34,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
         platformText(c.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
 
         if (c is Class) {
-            text(c.modifier.takeIf { it !in ignoredModifiers }?.toString()?.toLowerCase().orEmpty() + " ")
+            text(c.modifier.takeIf { it !in ignoredModifiers }?.name.orEmpty() + " ")
         }
 
         when (c) {
@@ -60,7 +60,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
     }
 
     private fun signature(f: Function) = contentBuilder.contentFor(f, ContentKind.Symbol) {
-        text(f.modifier.takeIf { it != WithAbstraction.Modifier.Empty }?.toString()?.toLowerCase().orEmpty() + " ")
+        text(f.modifier.takeIf { it !in ignoredModifiers }?.name.orEmpty() + " ")
         val returnType = f.type
         if (!f.isConstructor && returnType.constructorFqName != Unit::class.qualifiedName) {
             type(returnType)
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index a8b45db0..7c66e91f 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -42,7 +42,7 @@ internal fun Package.asJava(): Package {
                 generics = emptyList(),
                 supertypes = PlatformDependent.empty(),
                 documentation = PlatformDependent.empty(),
-                modifier = WithAbstraction.Modifier.Final,
+                modifier = JavaModifier.Final,
                 platformData = platformData,
                 extra = PropertyContainer.empty()
             )
@@ -64,9 +64,9 @@ internal fun Property.asJava(isTopLevel: Boolean = false, relocateToClass: Strin
             dri.withClass(relocateToClass)
         },
         modifier = if (setter == null) {
-            WithAbstraction.Modifier.Final
+            JavaModifier.Final
         } else {
-            WithAbstraction.Modifier.Empty
+            JavaModifier.Empty
         },
         visibility = visibility.copy(
             map = visibility.mapValues { JavaVisibility.Private }
@@ -87,9 +87,9 @@ internal fun Property.javaAccessors(isTopLevel: Boolean = false, relocateToClass
             },
             name = "get" + name.capitalize(),
             modifier = if (setter == null) {
-                WithAbstraction.Modifier.Final
+                JavaModifier.Final
             } else {
-                WithAbstraction.Modifier.Empty
+                JavaModifier.Empty
             },
             visibility = visibility.copy(
                 map = visibility.mapValues { JavaVisibility.Public }
@@ -105,9 +105,9 @@ internal fun Property.javaAccessors(isTopLevel: Boolean = false, relocateToClass
             },
             name = "set" + name.capitalize(),
             modifier = if (setter == null) {
-                WithAbstraction.Modifier.Final
+                JavaModifier.Final
             } else {
-                WithAbstraction.Modifier.Empty
+                JavaModifier.Empty
             },
             visibility = visibility.copy(
                 map = visibility.mapValues { JavaVisibility.Public }
@@ -189,7 +189,7 @@ internal fun Object.asJava(): Object = copy(
     properties = properties.map { it.asJava() } +
             Property(
                 name = "INSTANCE",
-                modifier = WithAbstraction.Modifier.Final,
+                modifier = JavaModifier.Final,
                 dri = dri.copy(callable = Callable("INSTANCE", null, emptyList())),
                 documentation = PlatformDependent.empty(),
                 sources = PlatformDependent.empty(),
@@ -281,16 +281,4 @@ private fun AdditionalModifiers.squash(second: AdditionalModifiers) =
     AdditionalModifiers((content + second.content).distinct())
 
 internal fun ClassId.classNames(): String =
-    shortClassName.identifier + (outerClassId?.classNames()?.let { ".$it" } ?: "")
-
-//fun TypeConstructor.asJava(): TypeReference =
-//    fullyQualifiedName.mapToJava()
-//        ?.let { tc.copy(fullyQualifiedName = it.asString(), params = tc.params.map { it.asJava() }) } ?: tc
-
-//fun TypeParam.asJava(): TypeReference = copy(bounds = bounds.map { it.asJava() })
-
-//fun TypeReference.asJava(): TypeReference = when (this) {
-//    is TypeConstructor -> asJava()
-//    is TypeParam -> asJava()
-//    else -> this
-//}
\ No newline at end of file
+    shortClassName.identifier + (outerClassId?.classNames()?.let { ".$it" } ?: "")
\ No newline at end of file
-- 
cgit 


From 91d785711dde2108f7494102eceb53ea8f4938ca Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Wed, 4 Mar 2020 17:49:28 +0100
Subject: Implement some additional modifiers

---
 .../src/main/kotlin/JavaSignatureProvider.kt       | 112 ---------------------
 .../src/main/kotlin/KotlinAsJavaPlugin.kt          |   7 +-
 .../kotlin/converters/KotlinToJavaConverter.kt     |  42 +++++---
 .../kotlin/signatures/JavaSignatureProvider.kt     | 109 ++++++++++++++++++++
 4 files changed, 145 insertions(+), 125 deletions(-)
 delete mode 100644 plugins/kotlin-as-java/src/main/kotlin/JavaSignatureProvider.kt
 create mode 100644 plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/plugins/kotlin-as-java/src/main/kotlin/JavaSignatureProvider.kt b/plugins/kotlin-as-java/src/main/kotlin/JavaSignatureProvider.kt
deleted file mode 100644
index 06224a7a..00000000
--- a/plugins/kotlin-as-java/src/main/kotlin/JavaSignatureProvider.kt
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.jetbrains.dokka.kotlinAsJava
-
-import org.jetbrains.dokka.base.signatures.SignatureProvider
-import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
-import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
-import org.jetbrains.dokka.links.sureClassNames
-import org.jetbrains.dokka.model.*
-import org.jetbrains.dokka.model.Annotation
-import org.jetbrains.dokka.model.Enum
-import org.jetbrains.dokka.model.Function
-import org.jetbrains.dokka.pages.ContentKind
-import org.jetbrains.dokka.pages.ContentNode
-import org.jetbrains.dokka.pages.PlatformData
-import org.jetbrains.dokka.utilities.DokkaLogger
-
-class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogger) : SignatureProvider {
-    private val contentBuilder = PageContentBuilder(ctcc, this, logger)
-
-    private val ignoredVisibilities = setOf(JavaVisibility.Default, KotlinVisibility.Public)
-    private val ignoredModifiers =
-        setOf(KotlinModifier.Open, JavaModifier.Empty, KotlinModifier.Empty, KotlinModifier.Sealed)
-
-
-    override fun signature(documentable: Documentable): ContentNode = when (documentable) {
-        is Function -> signature(documentable)
-        is Classlike -> signature(documentable)
-        is TypeParameter -> signature(documentable)
-        else -> throw NotImplementedError(
-            "Cannot generate signature for ${documentable::class.qualifiedName} ${documentable.name}"
-        )
-    }
-
-    private fun signature(c: Classlike) = contentBuilder.contentFor(c, ContentKind.Symbol) {
-        platformText(c.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
-
-        if (c is Class) {
-            text(c.modifier.takeIf { it !in ignoredModifiers }?.name.orEmpty() + " ")
-        }
-
-        when (c) {
-            is Class -> text("class ")
-            is Interface -> text("interface ")
-            is Enum -> text("enum ")
-            is Object -> text("class ")
-            is Annotation -> text("@interface ")
-        }
-        text(c.name!!)
-        if (c is WithGenerics) {
-            list(c.generics, prefix = "<", suffix = ">") {
-                +buildSignature(it)
-            }
-        }
-        if (c is WithSupertypes) {
-            c.supertypes.map { (p, dris) ->
-                list(dris, prefix = " extends ", platformData = setOf(p)) {
-                    link(it.sureClassNames, it, platformData = setOf(p))
-                }
-            }
-        }
-    }
-
-    private fun signature(f: Function) = contentBuilder.contentFor(f, ContentKind.Symbol) {
-        text(f.modifier.takeIf { it !in ignoredModifiers }?.name.orEmpty() + " ")
-        val returnType = f.type
-        if (!f.isConstructor && returnType.constructorFqName != Unit::class.qualifiedName) {
-            type(returnType)
-        }
-        text("  ")
-        link(f.name, f.dri)
-        list(f.generics, prefix = "<", suffix = ">") {
-            +buildSignature(it)
-        }
-        text("(")
-        list(f.parameters) {
-            type(it.type)
-            text(" ")
-            link(it.name!!, it.dri)
-        }
-        text(")")
-    }
-
-    private fun signature(t: TypeParameter) = contentBuilder.contentFor(t, ContentKind.Symbol) {
-        text(t.name.substringAfterLast("."))
-        list(t.bounds, prefix = " extends ") {
-            signatureForProjection(it)
-        }
-    }
-
-
-    private fun PageContentBuilder.DocumentableContentBuilder.signatureForProjection(p: Projection): Unit = when (p) {
-        is OtherParameter -> text(p.name)
-
-        is TypeConstructor -> group {
-            link(p.dri.classNames.orEmpty(), p.dri)
-            list(p.projections, prefix = "<", suffix = ">") {
-                signatureForProjection(it)
-            }
-        }
-
-        is Variance -> group {
-            text(p.kind.toString() + " ")
-            signatureForProjection(p.inner)
-        }
-
-        is Star -> text("?")
-
-        is Nullable -> signatureForProjection(p.inner)
-    }
-
-    private fun <T : Documentable> Collection<T>.filterOnPlatform(platformData: PlatformData) =
-        this.filter { it.platformData.contains(platformData) }
-}
\ No newline at end of file
diff --git a/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPlugin.kt b/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPlugin.kt
index 0ca278ce..bf9b8dc0 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPlugin.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPlugin.kt
@@ -2,6 +2,7 @@ package org.jetbrains.dokka.kotlinAsJava
 
 import org.jetbrains.dokka.CoreExtensions
 import org.jetbrains.dokka.base.DokkaBase
+import org.jetbrains.dokka.kotlinAsJava.signatures.JavaSignatureProvider
 import org.jetbrains.dokka.kotlinAsJava.transformers.KotlinAsJavaDocumentableTransformer
 import org.jetbrains.dokka.plugability.DokkaPlugin
 
@@ -12,7 +13,11 @@ class KotlinAsJavaPlugin : DokkaPlugin() {
     val javaSignatureProvider by extending {
         val dokkaBasePlugin = plugin<DokkaBase>()
         dokkaBasePlugin.signatureProvider providing { ctx ->
-            JavaSignatureProvider(ctx.single(dokkaBasePlugin.commentsToContentConverter), ctx.logger)
+            JavaSignatureProvider(
+                ctx.single(
+                    dokkaBasePlugin.commentsToContentConverter
+                ), ctx.logger
+            )
         }
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index 7c66e91f..4bf75101 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -32,12 +32,17 @@ internal fun Package.asJava(): Package {
                 properties = nodes.filterIsInstance<Property>().map { it.asJava() },
                 constructors = emptyList(),
                 functions = (
-                        nodes.filterIsInstance<Property>().map { it.javaAccessors() } +
-                                nodes.filterIsInstance<Function>().map { it.asJava(syntheticClassName) }
-                        ) as List<Function>, // TODO: methods are static and receiver is a param
+                        nodes.filterIsInstance<Property>()
+                            .map { it.javaAccessors() } +
+                                nodes.filterIsInstance<Function>()
+                                    .map { it.asJava(syntheticClassName) }) as List<Function>, // TODO: methods are static and receiver is a param
                 classlikes = emptyList(),
                 sources = PlatformDependent.empty(),
-                visibility = PlatformDependent.empty(), // TODO: fix this with the new visibility model -> public
+                visibility = PlatformDependent(
+                    platformData.map {
+                        it to JavaVisibility.Public
+                    }.toMap()
+                ),
                 companion = null,
                 generics = emptyList(),
                 supertypes = PlatformDependent.empty(),
@@ -127,9 +132,10 @@ internal fun Function.asJava(containingClassName: String): Function {
 //        dri = dri.copy(callable = dri.callable?.asJava()),
         name = newName,
         type = type.asJava(),
+        modifier = if(modifier is KotlinModifier.Final && isConstructor) JavaModifier.Empty else modifier,
         parameters = listOfNotNull(receiver?.asJava()) + parameters.map { it.asJava() },
         receiver = null
-    ) // TODO: should receiver be the first param?
+    ) // TODO static if toplevel
 }
 
 internal fun Classlike.asJava(): Classlike = when (this) {
@@ -151,8 +157,9 @@ internal fun Class.asJava(): Class = copy(
     generics = generics.map { it.asJava() },
     supertypes = supertypes.copy(
         map = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
-    )
-) // TODO: if modifier is from Kotlin, then Empty -> Final I think, Java ones stay the same
+    ),
+    modifier = if (modifier is KotlinModifier.Empty) JavaModifier.Final else modifier
+)
 
 private fun TypeParameter.asJava(): TypeParameter = copy(
     dri = dri.possiblyAsJava(),
@@ -180,7 +187,7 @@ internal fun Enum.asJava(): Enum = copy(
         map = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
     )
 //    , entries = entries.map { it.asJava() }
-) // TODO: if modifier is from Kotlin, then Empty -> Final I think, Java ones stay the same
+)
 
 internal fun Object.asJava(): Object = copy(
     functions = (functions + properties.map { it.getter } + properties.map { it.setter })
@@ -193,7 +200,11 @@ internal fun Object.asJava(): Object = copy(
                 dri = dri.copy(callable = Callable("INSTANCE", null, emptyList())),
                 documentation = PlatformDependent.empty(),
                 sources = PlatformDependent.empty(),
-                visibility = PlatformDependent.empty(), // TODO: public and static
+                visibility = PlatformDependent(
+                    platformData.map {
+                        it to JavaVisibility.Public
+                    }.toMap()
+                ),
                 type = JavaTypeWrapper(
                     dri.packageName?.split(".").orEmpty() +
                             dri.classNames?.split(".").orEmpty(),
@@ -204,7 +215,8 @@ internal fun Object.asJava(): Object = copy(
                 setter = null,
                 getter = null,
                 platformData = platformData,
-                receiver = null
+                receiver = null,
+                extra = PropertyContainer.empty<Property>() + AdditionalModifiers(listOf(ExtraModifiers.STATIC))
             ),
     classlikes = classlikes.map { it.asJava() },
     supertypes = supertypes.copy(
@@ -259,9 +271,15 @@ private fun DRI.partialFqName() = packageName?.let { "$it." } + classNames
 private fun DRI.possiblyAsJava() = this.partialFqName().mapToJava()?.toDRI(this) ?: this
 
 internal fun TypeWrapper.asJava(top: Boolean = true): TypeWrapper = constructorFqName
-//    ?.takeUnless { it.endsWith(".Unit") } // TODO: ???
+    ?.let { if (it.endsWith(".Unit")) return VoidTypeWrapper() else it }
     ?.let { fqName -> fqName.mapToJava()?.let { getAsType(it, fqName, top) } } ?: this
 
+private data class VoidTypeWrapper(
+    override val constructorFqName: String = "void",
+    override val constructorNamePathSegments: List<String> = listOf("void"),
+    override val arguments: List<TypeWrapper> = emptyList(),
+    override val dri: DRI = DRI("java.lang", "Void")
+) : TypeWrapper
 
 private fun String.mapToJava(): ClassId? =
     JavaToKotlinClassMap.mapKotlinToJava(FqName(this).toUnsafe())
@@ -269,7 +287,7 @@ private fun String.mapToJava(): ClassId? =
 internal fun ClassId.toDRI(dri: DRI?): DRI = DRI(
     packageName = packageFqName.asString(),
     classNames = classNames(),
-    callable = dri?.callable,//?.asJava(), TODO: ????
+    callable = dri?.callable,//?.asJava(), TODO: check this
     extra = null,
     target = null
 )
diff --git a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
new file mode 100644
index 00000000..91e5164d
--- /dev/null
+++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
@@ -0,0 +1,109 @@
+package org.jetbrains.dokka.kotlinAsJava.signatures
+
+import org.jetbrains.dokka.base.signatures.SignatureProvider
+import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
+import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
+import org.jetbrains.dokka.links.sureClassNames
+import org.jetbrains.dokka.model.*
+import org.jetbrains.dokka.model.Annotation
+import org.jetbrains.dokka.model.Enum
+import org.jetbrains.dokka.model.Function
+import org.jetbrains.dokka.pages.ContentKind
+import org.jetbrains.dokka.pages.ContentNode
+import org.jetbrains.dokka.pages.PlatformData
+import org.jetbrains.dokka.utilities.DokkaLogger
+
+class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogger) : SignatureProvider {
+    private val contentBuilder = PageContentBuilder(ctcc, this, logger)
+
+    private val ignoredVisibilities = setOf(JavaVisibility.Default, KotlinVisibility.Public)
+    private val ignoredModifiers =
+        setOf(KotlinModifier.Open, JavaModifier.Empty, KotlinModifier.Empty, KotlinModifier.Sealed)
+
+
+    override fun signature(documentable: Documentable): ContentNode = when (documentable) {
+        is Function -> signature(documentable)
+        is Classlike -> signature(documentable)
+        is TypeParameter -> signature(documentable)
+        else -> throw NotImplementedError(
+            "Cannot generate signature for ${documentable::class.qualifiedName} ${documentable.name}"
+        )
+    }
+
+    private fun signature(c: Classlike) = contentBuilder.contentFor(c, ContentKind.Symbol) {
+        platformText(c.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
+
+        if (c is Class) {
+            text(c.modifier.takeIf { it !in ignoredModifiers }?.name.orEmpty() + " ")
+        }
+
+        when (c) {
+            is Class -> text("class ")
+            is Interface -> text("interface ")
+            is Enum -> text("enum ")
+            is Object -> text("class ")
+            is Annotation -> text("@interface ")
+        }
+        text(c.name!!)
+        if (c is WithGenerics) {
+            list(c.generics, prefix = "<", suffix = ">") {
+                +buildSignature(it)
+            }
+        }
+        if (c is WithSupertypes) {
+            c.supertypes.map { (p, dris) ->
+                list(dris, prefix = " extends ", platformData = setOf(p)) {
+                    link(it.sureClassNames, it, platformData = setOf(p))
+                }
+            }
+        }
+    }
+
+    private fun signature(f: Function) = contentBuilder.contentFor(f, ContentKind.Symbol) {
+        text(f.modifier.takeIf { it !in ignoredModifiers }?.name.orEmpty() + " ")
+        val returnType = f.type
+        if (!f.isConstructor && returnType.constructorFqName != Unit::class.qualifiedName) {
+            type(returnType)
+        }
+        text("  ")
+        link(f.name, f.dri)
+        list(f.generics, prefix = "<", suffix = ">") {
+            +buildSignature(it)
+        }
+        text("(")
+        list(f.parameters) {
+            type(it.type)
+            text(" ")
+            link(it.name!!, it.dri)
+        }
+        text(")")
+    }
+
+    private fun signature(t: TypeParameter) = contentBuilder.contentFor(t, ContentKind.Symbol) {
+        text(t.name.substringAfterLast("."))
+        list(t.bounds, prefix = " extends ") {
+            signatureForProjection(it)
+        }
+    }
+
+
+    private fun PageContentBuilder.DocumentableContentBuilder.signatureForProjection(p: Projection): Unit = when (p) {
+        is OtherParameter -> text(p.name)
+
+        is TypeConstructor -> group {
+            link(p.dri.classNames.orEmpty(), p.dri)
+            list(p.projections, prefix = "<", suffix = ">") {
+                signatureForProjection(it)
+            }
+        }
+
+        is Variance -> group {
+            text(p.kind.toString() + " ")
+            signatureForProjection(p.inner)
+        }
+
+        is Star -> text("?")
+
+        is Nullable -> signatureForProjection(p.inner)
+    }
+}
\ No newline at end of file
-- 
cgit 


From 35851c4f00bde0b66ce1d9ae8ca02bab761df819 Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Tue, 10 Mar 2020 14:18:11 +0100
Subject: Remove nested packages from packages

---
 core/src/main/kotlin/model/Documentable.kt                  | 13 ++++---------
 .../transformers/documentables/DefaultDocumentableMerger.kt |  1 -
 .../DefaultDescriptorToDocumentableTranslator.kt            |  1 -
 .../kotlin/translators/documentables/DefaultPageCreator.kt  |  3 +--
 .../translators/psi/DefaultPsiToDocumentableTranslator.kt   |  1 -
 .../src/main/kotlin/converters/KotlinToJavaConverter.kt     |  3 +--
 6 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/core/src/main/kotlin/model/Documentable.kt b/core/src/main/kotlin/model/Documentable.kt
index d073d39a..8ff5969c 100644
--- a/core/src/main/kotlin/model/Documentable.kt
+++ b/core/src/main/kotlin/model/Documentable.kt
@@ -59,10 +59,6 @@ interface WithScope {
     val classlikes: List<Classlike>
 }
 
-interface WithPackages {
-    val packages: List<Package>
-}
-
 interface WithVisibility {
     val visibility: PlatformDependent<Visibility>
 }
@@ -114,11 +110,11 @@ abstract class Classlike : Documentable(), WithScope, WithVisibility, WithExpect
 
 data class Module(
     override val name: String,
-    override val packages: List<Package>,
+    val packages: List<Package>,
     override val documentation: PlatformDependent<DocumentationNode>,
     override val platformData: List<PlatformData>,
     override val extra: PropertyContainer<Module> = PropertyContainer.empty()
-) : Documentable(), WithPackages, WithExtraProperties<Module> {
+) : Documentable(), WithExtraProperties<Module> {
     override val dri: DRI = DRI.topLevel
     override val children: List<Documentable>
         get() = packages
@@ -131,14 +127,13 @@ data class Package(
     override val functions: List<Function>,
     override val properties: List<Property>,
     override val classlikes: List<Classlike>,
-    override val packages: List<Package>,
     override val documentation: PlatformDependent<DocumentationNode>,
     override val platformData: List<PlatformData>,
     override val extra: PropertyContainer<Package> = PropertyContainer.empty()
-) : Documentable(), WithScope, WithPackages, WithExtraProperties<Package> {
+) : Documentable(), WithScope, WithExtraProperties<Package> {
     override val name = dri.packageName.orEmpty()
     override val children: List<Documentable>
-        get() = (properties + functions + classlikes + packages) as List<Documentable>
+        get() = (properties + functions + classlikes) as List<Documentable>
 
     override fun withNewExtras(newExtras: PropertyContainer<Package>) = copy(extra = newExtras)
 }
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
index 8ae2065b..654238a8 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
@@ -97,7 +97,6 @@ fun Package.mergeWith(other: Package): Package = copy(
     functions = mergeExpectActual(functions + other.functions, Function::mergeWith) { copy(platformData = it) },
     properties = mergeExpectActual(properties + other.properties, Property::mergeWith) { copy(platformData = it) },
     classlikes = mergeExpectActual(classlikes + other.classlikes, Classlike::mergeWith, Classlike::setPlatformData),
-    packages = merge(packages + other.packages, Package::mergeWith),
     documentation = documentation.mergeWith(other.documentation),
     platformData = (platformData + other.platformData).distinct()
 ).mergeExtras(this, other)
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index 72ce296d..a1fda688 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -78,7 +78,6 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
             functions = scope.functions(driWithPlatform),
             properties = scope.properties(driWithPlatform),
             classlikes = scope.classlikes(driWithPlatform),
-            packages = scope.packages(driWithPlatform),
             documentation = descriptor.resolveDescriptorData(platformData),
             platformData = listOf(platformData)
         )
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index d92bec19..c82af936 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -24,8 +24,7 @@ open class DefaultPageCreator(
     open fun pageForPackage(p: Package): PackagePageNode = PackagePageNode(
         p.name, contentForPackage(p), setOf(p.dri), p,
         p.classlikes.map(::pageForClasslike) +
-                p.functions.map(::pageForFunction) +
-                p.packages.map(::pageForPackage)
+                p.functions.map(::pageForFunction)
     )
 
     open fun pageForClasslike(c: Classlike): ClasslikePageNode {
diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
index 28391741..b07d248d 100644
--- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
@@ -47,7 +47,6 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
                     psiFiles.flatMap { psFile ->
                         psFile.classes.map { docParser.parseClasslike(it, dri) }
                     },
-                    emptyList(),
                     PlatformDependent.empty(),
                     listOf(platformData)
                 )
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index 4bf75101..2d73786b 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -56,8 +56,7 @@ internal fun Package.asJava(): Package {
     return copy(
         functions = emptyList(),
         properties = emptyList(),
-        classlikes = classlikes.map { it.asJava() } + syntheticClasses,
-        packages = packages.map { it.asJava() }
+        classlikes = classlikes.map { it.asJava() } + syntheticClasses
     )
 }
 
-- 
cgit 


From 11b223daa2c54d2b86efb5e6054fd7205ed0b37a Mon Sep 17 00:00:00 2001
From: Paweł Marks <pmarks@virtuslab.com>
Date: Wed, 11 Mar 2020 11:51:57 +0100
Subject: Properly merge AdditionalModifiers from different platforms

---
 core/src/main/kotlin/model/aditionalExtras.kt                | 10 ++++++++--
 .../descriptors/DefaultDescriptorToDocumentableTranslator.kt |  2 +-
 .../src/main/kotlin/converters/KotlinToJavaConverter.kt      | 12 ++++++------
 3 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

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()
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index a1fda688..2b73dc7f 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -495,7 +495,7 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
     inline fun <reified D : Documentable> List<ExtraModifiers>.toContainer(
         container: PropertyContainer<D> = PropertyContainer.empty()
     ): PropertyContainer<D> =
-        container + AdditionalModifiers(this)
+        container + AdditionalModifiers(this.toSet())
 
     data class ClassInfo(val supertypes: List<DRI>, val docs: PlatformDependent<DocumentationNode>)
 
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index 2d73786b..3b0f69f6 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -78,7 +78,7 @@ internal fun Property.asJava(isTopLevel: Boolean = false, relocateToClass: Strin
         type = type.asJava(isTopLevel), // TODO: check
         setter = null,
         getter = null, // Removing getters and setters as they will be available as functions
-        extra = if (isTopLevel) extra.plus(extra.mergeAdditionalModifiers(listOf(ExtraModifiers.STATIC))) else extra
+        extra = if (isTopLevel) extra.plus(extra.mergeAdditionalModifiers(setOf(ExtraModifiers.STATIC))) else extra
     )
 
 internal fun Property.javaAccessors(isTopLevel: Boolean = false, relocateToClass: String? = null): List<Function> =
@@ -99,7 +99,7 @@ internal fun Property.javaAccessors(isTopLevel: Boolean = false, relocateToClass
                 map = visibility.mapValues { JavaVisibility.Public }
             ),
             type = type.asJava(isTopLevel), // TODO: check
-            extra = if (isTopLevel) getter!!.extra.plus(getter!!.extra.mergeAdditionalModifiers(listOf(ExtraModifiers.STATIC))) else getter!!.extra
+            extra = if (isTopLevel) getter!!.extra.plus(getter!!.extra.mergeAdditionalModifiers(setOf(ExtraModifiers.STATIC))) else getter!!.extra
         ),
         setter?.copy(
             dri = if (relocateToClass.isNullOrBlank()) {
@@ -117,7 +117,7 @@ internal fun Property.javaAccessors(isTopLevel: Boolean = false, relocateToClass
                 map = visibility.mapValues { JavaVisibility.Public }
             ),
             type = type.asJava(isTopLevel), // TODO: check
-            extra = if (isTopLevel) setter!!.extra.plus(setter!!.extra.mergeAdditionalModifiers(listOf(ExtraModifiers.STATIC))) else setter!!.extra
+            extra = if (isTopLevel) setter!!.extra.plus(setter!!.extra.mergeAdditionalModifiers(setOf(ExtraModifiers.STATIC))) else setter!!.extra
         )
     )
 
@@ -215,7 +215,7 @@ internal fun Object.asJava(): Object = copy(
                 getter = null,
                 platformData = platformData,
                 receiver = null,
-                extra = PropertyContainer.empty<Property>() + AdditionalModifiers(listOf(ExtraModifiers.STATIC))
+                extra = PropertyContainer.empty<Property>() + AdditionalModifiers(setOf(ExtraModifiers.STATIC))
             ),
     classlikes = classlikes.map { it.asJava() },
     supertypes = supertypes.copy(
@@ -291,11 +291,11 @@ internal fun ClassId.toDRI(dri: DRI?): DRI = DRI(
     target = null
 )
 
-private fun PropertyContainer<out Documentable>.mergeAdditionalModifiers(second: List<ExtraModifiers>) =
+private fun PropertyContainer<out Documentable>.mergeAdditionalModifiers(second: Set<ExtraModifiers>) =
     this[AdditionalModifiers.AdditionalKey]?.squash(AdditionalModifiers(second)) ?: AdditionalModifiers(second)
 
 private fun AdditionalModifiers.squash(second: AdditionalModifiers) =
-    AdditionalModifiers((content + second.content).distinct())
+    AdditionalModifiers(content + second.content)
 
 internal fun ClassId.classNames(): String =
     shortClassName.identifier + (outerClassId?.classNames()?.let { ".$it" } ?: "")
\ No newline at end of file
-- 
cgit 


From 8e4ffa367b43cdc57c3921fab2182a4209913a51 Mon Sep 17 00:00:00 2001
From: Paweł Marks <pmarks@virtuslab.com>
Date: Wed, 11 Mar 2020 16:55:40 +0100
Subject: Use Bounds instead of Wrappers to describe types

---
 core/src/main/kotlin/links/DRI.kt                  |   2 +
 core/src/main/kotlin/model/Documentable.kt         |  11 ++-
 core/src/main/kotlin/model/typeWrappers.kt         | 101 ---------------------
 .../kotlin/signatures/KotlinSignatureProvider.kt   |  23 +++--
 .../DefaultDescriptorToDocumentableTranslator.kt   |  20 ++--
 .../documentables/PageContentBuilder.kt            |  19 +---
 .../psi/DefaultPsiToDocumentableTranslator.kt      |  30 ++++--
 .../kotlin/converters/KotlinToJavaConverter.kt     |  41 +--------
 .../kotlin/signatures/JavaSignatureProvider.kt     |  10 +-
 9 files changed, 68 insertions(+), 189 deletions(-)
 delete mode 100644 core/src/main/kotlin/model/typeWrappers.kt

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/core/src/main/kotlin/links/DRI.kt b/core/src/main/kotlin/links/DRI.kt
index 57ac96e5..cc78ab6f 100644
--- a/core/src/main/kotlin/links/DRI.kt
+++ b/core/src/main/kotlin/links/DRI.kt
@@ -56,6 +56,8 @@ data class DRI(
     }
 }
 
+val DriOfUnit = DRI("kotlin", "Unit")
+
 fun DRI.withClass(name: String) = copy(classNames = if (classNames.isNullOrBlank()) name else "$classNames.$name")
 
 val DRI.parent: DRI
diff --git a/core/src/main/kotlin/model/Documentable.kt b/core/src/main/kotlin/model/Documentable.kt
index 176647fa..b697f4e4 100644
--- a/core/src/main/kotlin/model/Documentable.kt
+++ b/core/src/main/kotlin/model/Documentable.kt
@@ -58,7 +58,7 @@ interface WithVisibility {
 }
 
 interface WithType {
-    val type: TypeWrapper
+    val type: Bound
 }
 
 interface WithAbstraction {
@@ -203,7 +203,7 @@ data class Function(
     override val documentation: PlatformDependent<DocumentationNode>,
     override val sources: PlatformDependent<DocumentableSource>,
     override val visibility: PlatformDependent<Visibility>,
-    override val type: TypeWrapper,
+    override val type: Bound,
     override val generics: List<TypeParameter>,
     override val receiver: Parameter?,
     override val modifier: Modifier,
@@ -282,7 +282,7 @@ data class Property(
     override val documentation: PlatformDependent<DocumentationNode>,
     override val sources: PlatformDependent<DocumentableSource>,
     override val visibility: PlatformDependent<Visibility>,
-    override val type: TypeWrapper,
+    override val type: Bound,
     override val receiver: Parameter?,
     val setter: Function?,
     val getter: Function?,
@@ -301,7 +301,7 @@ data class Parameter(
     override val dri: DRI,
     override val name: String?,
     override val documentation: PlatformDependent<DocumentationNode>,
-    val type: TypeWrapper,
+    val type: Bound,
     override val platformData: List<PlatformData>,
     override val extra: PropertyContainer<Parameter> = PropertyContainer.empty()
 ) : Documentable(), WithExtraProperties<Parameter> {
@@ -334,6 +334,9 @@ data class Nullable(val inner: Bound) : Bound()
 data class Variance(val kind: Kind, val inner: Bound) : Projection() {
     enum class Kind { In, Out }
 }
+data class PrimitiveJavaType(val name: String): Bound()
+
+val VoidBound = PrimitiveJavaType("void")
 
 enum class ExtraModifiers {
     STATIC, INLINE, INFIX, SUSPEND, REIFIED, CROSSINLINE, NOINLINE,
diff --git a/core/src/main/kotlin/model/typeWrappers.kt b/core/src/main/kotlin/model/typeWrappers.kt
deleted file mode 100644
index b26a3f6d..00000000
--- a/core/src/main/kotlin/model/typeWrappers.kt
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.jetbrains.dokka.model
-
-import com.intellij.psi.PsiArrayType
-import com.intellij.psi.PsiEllipsisType
-import com.intellij.psi.PsiPrimitiveType
-import com.intellij.psi.PsiType
-import com.intellij.psi.impl.source.PsiClassReferenceType
-import org.jetbrains.dokka.links.DRI
-import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
-import org.jetbrains.kotlin.types.KotlinType
-
-interface TypeWrapper {
-    val constructorFqName: String?
-    val constructorNamePathSegments: List<String>
-    val arguments: List<TypeWrapper>
-    val dri: DRI?
-}
-
-class KotlinTypeWrapper(private val kotlinType: KotlinType) : TypeWrapper {
-    private val declarationDescriptor = kotlinType.constructor.declarationDescriptor
-    private val fqNameSafe = declarationDescriptor?.fqNameSafe
-    override val constructorFqName = fqNameSafe?.asString()
-    override val constructorNamePathSegments: List<String> =
-        fqNameSafe?.pathSegments()?.map { it.asString() } ?: emptyList()
-    override val arguments: List<KotlinTypeWrapper> by lazy {
-        kotlinType.arguments.map {
-            KotlinTypeWrapper(
-                it.type
-            )
-        }
-    }
-    override val dri: DRI? by lazy { declarationDescriptor?.let { DRI.from(it) } }
-}
-
-class JavaTypeWrapper : TypeWrapper {
-
-    override val constructorFqName: String?
-    override val constructorNamePathSegments: List<String>
-    override val arguments: List<TypeWrapper>
-    override val dri: DRI?
-    val isPrimitive: Boolean
-
-    constructor(
-        constructorNamePathSegments: List<String>,
-        arguments: List<TypeWrapper>,
-        dri: DRI?,
-        isPrimitiveType: Boolean
-    ) {
-        this.constructorFqName = constructorNamePathSegments.joinToString(".")
-        this.constructorNamePathSegments = constructorNamePathSegments
-        this.arguments = arguments
-        this.dri = dri
-        this.isPrimitive = isPrimitiveType
-    }
-
-    constructor(type: PsiType) {
-        if (type is PsiClassReferenceType) {
-            val resolved = type.resolve()
-            constructorFqName = resolved?.qualifiedName
-            constructorNamePathSegments = resolved?.qualifiedName?.split('.') ?: emptyList()
-            arguments = type.parameters.mapNotNull {
-                if (it is PsiClassReferenceType) JavaTypeWrapper(it) else null
-            }
-            dri = fromPsi(type)
-            this.isPrimitive = false
-        } else if (type is PsiEllipsisType) {
-            constructorFqName = type.canonicalText
-            constructorNamePathSegments = listOf(type.canonicalText) // TODO
-            arguments = emptyList()
-            dri = DRI("java.lang", "Object") // TODO
-            this.isPrimitive = false
-        } else if (type is PsiArrayType) {
-            constructorFqName = type.canonicalText
-            constructorNamePathSegments = listOf(type.canonicalText)
-            arguments = emptyList()
-            dri = (type as? PsiClassReferenceType)?.let { fromPsi(it) } // TODO
-            this.isPrimitive = false
-        } else {
-            type as PsiPrimitiveType
-            constructorFqName = type.name
-            constructorNamePathSegments = type.name.split('.')
-            arguments = emptyList()
-            dri = null
-            this.isPrimitive = true
-        }
-    }
-
-    private fun fromPsi(type: PsiClassReferenceType): DRI {
-        val className = type.className
-        val pkg = type.canonicalText.removeSuffix(className).removeSuffix(".")
-        return DRI(packageName = pkg, classNames = className)
-    }
-
-    override fun toString(): String {
-        return constructorFqName.orEmpty()
-    }
-
-    companion object {
-        val VOID = JavaTypeWrapper(listOf("void"), listOf(), null, true)
-    }
-}
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
index b468c56b..3c4698fe 100644
--- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
+++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
@@ -2,6 +2,8 @@ package org.jetbrains.dokka.base.signatures
 
 import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
 import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
+import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.links.DriOfUnit
 import org.jetbrains.dokka.links.sureClassNames
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.Annotation
@@ -53,25 +55,25 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
         platformText(f.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
         text(f.modifier.name + " ")
         text("fun ")
+        list(f.generics, prefix = "<", suffix = "> ") {
+            +buildSignature(it)
+        }
         f.receiver?.also {
-            type(it.type)
+            signatureForProjection(it.type)
             text(".")
         }
         link(f.name, f.dri)
-        list(f.generics, prefix = "<", suffix = ">") {
-            +buildSignature(it)
-        }
         text("(")
         list(f.parameters) {
             text(it.name!!)
             text(": ")
-            type(it.type)
+            signatureForProjection(it.type)
         }
         text(")")
         val returnType = f.type
-        if (!f.isConstructor && returnType.constructorFqName != Unit::class.qualifiedName) {
+        if (!f.isConstructor && returnType is TypeConstructor && returnType.dri != DriOfUnit) {
             text(": ")
-            type(returnType)
+            signatureForProjection(returnType)
         }
     }
 
@@ -103,5 +105,12 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
             signatureForProjection(p.inner)
             text("?")
         }
+
+        is PrimitiveJavaType -> signatureForProjection(p.translateToKotlin())
     }
 }
+
+private fun PrimitiveJavaType.translateToKotlin() = TypeConstructor(
+    dri = DRI("kotlin", name.capitalize()),
+    projections = emptyList()
+)
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index 2b73dc7f..9a71145f 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -223,7 +223,7 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
             visibility = PlatformDependent(mapOf(platformData to descriptor.visibility.toDokkaVisibility())),
             documentation = descriptor.resolveDescriptorData(platformData),
             modifier = descriptor.modifier(),
-            type = KotlinTypeWrapper(descriptor.returnType!!),
+            type = descriptor.returnType!!.toBound(),
             platformData = listOf(platformData),
             extra = descriptor.additionalExtras()
         )
@@ -248,7 +248,7 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
             generics = descriptor.typeParameters.map { it.toTypeParameter() },
             documentation = descriptor.resolveDescriptorData(platformData),
             modifier = descriptor.modifier(),
-            type = KotlinTypeWrapper(descriptor.returnType!!),
+            type = descriptor.returnType!!.toBound(),
             platformData = listOf(platformData),
             extra = descriptor.additionalExtras()
         )
@@ -270,7 +270,7 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
             sources = actual,
             visibility = PlatformDependent(mapOf(platformData to descriptor.visibility.toDokkaVisibility())),
             documentation = descriptor.resolveDescriptorData(platformData),
-            type = KotlinTypeWrapper(descriptor.returnType),
+            type = descriptor.returnType.toBound(),
             modifier = descriptor.modifier(),
             generics = descriptor.typeParameters.map { it.toTypeParameter() },
             platformData = listOf(platformData),
@@ -284,7 +284,7 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
     ) = Parameter(
         dri = parent.dri.copy(target = 0),
         name = null,
-        type = KotlinTypeWrapper(descriptor.type),
+        type = descriptor.type.toBound(),
         documentation = descriptor.resolveDescriptorData(platformData),
         platformData = listOf(platformData)
     )
@@ -301,7 +301,7 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
             Parameter(
                 parent.copy(target = 1),
                 this.name.asString(),
-                type = KotlinTypeWrapper(this.type),
+                type = this.type.toBound(),
                 documentation = descriptor.resolveDescriptorData(platformData),
                 platformData = listOf(platformData),
                 extra = descriptor.additionalExtras()
@@ -327,7 +327,7 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
             parameters = parameters,
             visibility = PlatformDependent(mapOf(platformData to descriptor.visibility.toDokkaVisibility())),
             documentation = descriptor.resolveDescriptorData(platformData),
-            type = KotlinTypeWrapper(descriptor.returnType!!),
+            type = descriptor.returnType!!.toBound(),
             generics = descriptor.typeParameters.map { it.toTypeParameter() },
             modifier = descriptor.modifier(),
             receiver = descriptor.extensionReceiverParameter?.let {
@@ -346,7 +346,7 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
         Parameter(
             dri = parent.dri.copy(target = index + 1),
             name = descriptor.name.asString(),
-            type = KotlinTypeWrapper(descriptor.type),
+            type = descriptor.type.toBound(),
             documentation = descriptor.resolveDescriptorData(platformData),
             platformData = listOf(platformData),
             extra = descriptor.additionalExtras()
@@ -393,15 +393,15 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
     private fun TypeParameterDescriptor.toTypeParameter() =
         TypeParameter(
             DRI.from(this),
-            fqNameSafe.asString(),
+            name.identifier,
             PlatformDependent.from(platformData, getDocumentation()),
             upperBounds.map { it.toBound() },
             listOf(platformData),
             extra = additionalExtras()
         )
 
-    private fun KotlinType.toBound(): Bound = when (constructor.declarationDescriptor) {
-        is TypeParameterDescriptor -> OtherParameter(fqName.toString()).let {
+    private fun KotlinType.toBound(): Bound = when (val ctor = constructor.declarationDescriptor) {
+        is TypeParameterDescriptor -> OtherParameter(ctor.name.asString()).let {
             if (isMarkedNullable) Nullable(it) else it
         }
         else -> TypeConstructor(
diff --git a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
index f5880656..681b8c71 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
@@ -3,9 +3,7 @@ package org.jetbrains.dokka.base.translators.documentables
 import org.jetbrains.dokka.base.signatures.SignatureProvider
 import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
 import org.jetbrains.dokka.links.DRI
-import org.jetbrains.dokka.model.Documentable
-import org.jetbrains.dokka.model.PlatformDependent
-import org.jetbrains.dokka.model.TypeWrapper
+import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.doc.DocTag
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.dokka.pages.*
@@ -256,21 +254,6 @@ open class PageContentBuilder(
         ) =
             ContentText(text, DCI(setOf(mainDRI), kind), platformData, styles, extra)
 
-        fun type(t: TypeWrapper) {
-            if (t.constructorNamePathSegments.isNotEmpty() && t.dri != null)
-                link(t.constructorNamePathSegments.last(), t.dri!!)
-            else if (t.constructorNamePathSegments.isNotEmpty() && t.dri == null)
-                text(t.toString())
-            else {
-                logger.error("type $t cannot be resolved")
-                text("???")
-            }
-            list(t.arguments, prefix = "<", suffix = ">") {
-                type(it)
-            }
-        }
-
-
         fun <T> platformText(
             value: PlatformDependent<T>,
             transform: (T) -> String
diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
index b07d248d..8bf556af 100644
--- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
@@ -3,6 +3,7 @@ package org.jetbrains.dokka.base.translators.psi
 import com.intellij.lang.jvm.JvmModifier
 import com.intellij.lang.jvm.types.JvmReferenceType
 import com.intellij.psi.*
+import com.intellij.psi.impl.source.PsiClassReferenceType
 import org.jetbrains.dokka.links.Callable
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.links.JavaClassReference
@@ -63,7 +64,7 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
 
         private val javadocParser: JavaDocumentationParser = JavadocParser(logger)
 
-        private val typeWrappers = hashMapOf<String, TypeWrapper>()
+        private val cachedBounds = hashMapOf<String, Bound>()
 
         private fun PsiModifierListOwner.getVisibility() = modifierList?.children?.toList()?.let { ml ->
             when {
@@ -226,14 +227,14 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
                         dri.copy(target = index + 1),
                         psiParameter.name,
                         javadocParser.parseDocumentation(psiParameter).toPlatformDependant(),
-                        getTypeWrapper(psiParameter.type),
+                        getBound(psiParameter.type),
                         listOf(platformData)
                     )
                 },
                 javadocParser.parseDocumentation(psi).toPlatformDependant(),
                 PsiDocumentableSource(psi).toPlatformDependant(),
                 psi.getVisibility().toPlatformDependant(),
-                psi.returnType?.let { getTypeWrapper(type = it) } ?: JavaTypeWrapper.VOID,
+                psi.returnType?.let { getBound(type = it) } ?: VoidBound,
                 psi.mapTypeParameters(dri),
                 null,
                 psi.getModifier(),
@@ -244,8 +245,22 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
             )
         }
 
-        private fun getTypeWrapper(type: PsiType) : TypeWrapper =
-            typeWrappers.getOrPut(type.canonicalText, { JavaTypeWrapper(type) })
+        private fun getBound(type: PsiType): Bound =
+            cachedBounds.getOrPut(type.canonicalText) {
+                when (type) {
+                    is PsiClassReferenceType -> {
+                        val resolved: PsiClass = type.resolve()
+                            ?: throw IllegalStateException("${type.presentableText} cannot be resolved")
+                        val arguments = type.parameters.map { getProjection(it) }
+                        TypeConstructor(DRI.from(resolved), arguments)
+                    }
+                    is PsiArrayType -> TypeConstructor(DRI("kotlin", "Array"), listOf(getProjection(type.componentType)))
+                    is PsiPrimitiveType -> PrimitiveJavaType(type.name)
+                    else -> throw IllegalStateException("${type.presentableText} is not supported by PSI parser")
+                }
+            }
+
+        private fun getProjection(type: PsiType): Projection = if (type is PsiEllipsisType) Star else getBound(type)
 
         private fun PsiModifierListOwner.getModifier() = when {
             hasModifier(JvmModifier.ABSTRACT) -> JavaModifier.Abstract
@@ -278,7 +293,8 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
             getAnnotation(DescriptorUtils.JVM_NAME.asString())?.findAttributeValue("name")?.text
                 ?: when {
                     JvmAbi.isGetterName(name) -> propertyNameByGetMethodName(Name.identifier(name))?.asString()
-                    JvmAbi.isSetterName(name) -> propertyNamesBySetMethodName(Name.identifier(name)).firstOrNull()?.asString()
+                    JvmAbi.isSetterName(name) -> propertyNamesBySetMethodName(Name.identifier(name)).firstOrNull()
+                        ?.asString()
                     else -> null
                 }
 
@@ -311,7 +327,7 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
                 javadocParser.parseDocumentation(psi).toPlatformDependant(),
                 PsiDocumentableSource(psi).toPlatformDependant(),
                 psi.getVisibility().toPlatformDependant(),
-                getTypeWrapper(psi.type),
+                getBound(psi.type),
                 null,
                 accessors.firstOrNull { it.hasParameters() }?.let { parseFunction(it, parent) },
                 accessors.firstOrNull { it.returnType == psi.type }?.let { parseFunction(it, parent) },
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index 3b0f69f6..cf777e67 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -75,7 +75,7 @@ internal fun Property.asJava(isTopLevel: Boolean = false, relocateToClass: Strin
         visibility = visibility.copy(
             map = visibility.mapValues { JavaVisibility.Private }
         ),
-        type = type.asJava(isTopLevel), // TODO: check
+        type = type.asJava(), // TODO: check
         setter = null,
         getter = null, // Removing getters and setters as they will be available as functions
         extra = if (isTopLevel) extra.plus(extra.mergeAdditionalModifiers(setOf(ExtraModifiers.STATIC))) else extra
@@ -98,7 +98,7 @@ internal fun Property.javaAccessors(isTopLevel: Boolean = false, relocateToClass
             visibility = visibility.copy(
                 map = visibility.mapValues { JavaVisibility.Public }
             ),
-            type = type.asJava(isTopLevel), // TODO: check
+            type = type.asJava(), // TODO: check
             extra = if (isTopLevel) getter!!.extra.plus(getter!!.extra.mergeAdditionalModifiers(setOf(ExtraModifiers.STATIC))) else getter!!.extra
         ),
         setter?.copy(
@@ -116,7 +116,7 @@ internal fun Property.javaAccessors(isTopLevel: Boolean = false, relocateToClass
             visibility = visibility.copy(
                 map = visibility.mapValues { JavaVisibility.Public }
             ),
-            type = type.asJava(isTopLevel), // TODO: check
+            type = type.asJava(), // TODO: check
             extra = if (isTopLevel) setter!!.extra.plus(setter!!.extra.mergeAdditionalModifiers(setOf(ExtraModifiers.STATIC))) else setter!!.extra
         )
     )
@@ -204,13 +204,7 @@ internal fun Object.asJava(): Object = copy(
                         it to JavaVisibility.Public
                     }.toMap()
                 ),
-                type = JavaTypeWrapper(
-                    dri.packageName?.split(".").orEmpty() +
-                            dri.classNames?.split(".").orEmpty(),
-                    emptyList(),
-                    dri,
-                    false
-                ),
+                type = TypeConstructor(dri, emptyList()),
                 setter = null,
                 getter = null,
                 platformData = platformData,
@@ -250,36 +244,9 @@ internal fun String.getAsPrimitive(): JvmPrimitiveType? = org.jetbrains.kotlin.b
     .find { it.typeFqName.asString() == this }
     ?.let { JvmPrimitiveType.get(it) }
 
-internal fun TypeWrapper.getAsType(classId: ClassId, fqName: String, top: Boolean): TypeWrapper {
-    val fqNameSplit = fqName
-        .takeIf { top }
-        ?.getAsPrimitive()
-        ?.name?.toLowerCase()
-        ?.let(::listOf)
-        ?: classId.asString().split("/")
-
-    return JavaTypeWrapper(
-        fqNameSplit,
-        arguments.map { it.asJava(false) },
-        classId.toDRI(dri),
-        fqNameSplit.last()[0].isLowerCase()
-    )
-}
-
 private fun DRI.partialFqName() = packageName?.let { "$it." } + classNames
 private fun DRI.possiblyAsJava() = this.partialFqName().mapToJava()?.toDRI(this) ?: this
 
-internal fun TypeWrapper.asJava(top: Boolean = true): TypeWrapper = constructorFqName
-    ?.let { if (it.endsWith(".Unit")) return VoidTypeWrapper() else it }
-    ?.let { fqName -> fqName.mapToJava()?.let { getAsType(it, fqName, top) } } ?: this
-
-private data class VoidTypeWrapper(
-    override val constructorFqName: String = "void",
-    override val constructorNamePathSegments: List<String> = listOf("void"),
-    override val arguments: List<TypeWrapper> = emptyList(),
-    override val dri: DRI = DRI("java.lang", "Void")
-) : TypeWrapper
-
 private fun String.mapToJava(): ClassId? =
     JavaToKotlinClassMap.mapKotlinToJava(FqName(this).toUnsafe())
 
diff --git a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
index 91e5164d..265e05cd 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
@@ -62,9 +62,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
     private fun signature(f: Function) = contentBuilder.contentFor(f, ContentKind.Symbol) {
         text(f.modifier.takeIf { it !in ignoredModifiers }?.name.orEmpty() + " ")
         val returnType = f.type
-        if (!f.isConstructor && returnType.constructorFqName != Unit::class.qualifiedName) {
-            type(returnType)
-        }
+        signatureForProjection(returnType)
         text("  ")
         link(f.name, f.dri)
         list(f.generics, prefix = "<", suffix = ">") {
@@ -72,7 +70,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
         }
         text("(")
         list(f.parameters) {
-            type(it.type)
+            signatureForProjection(it.type)
             text(" ")
             link(it.name!!, it.dri)
         }
@@ -98,12 +96,14 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
         }
 
         is Variance -> group {
-            text(p.kind.toString() + " ")
+            text(p.kind.toString() + " ") // TODO: "super" && "extends"
             signatureForProjection(p.inner)
         }
 
         is Star -> text("?")
 
         is Nullable -> signatureForProjection(p.inner)
+
+        is PrimitiveJavaType -> text(p.name)
     }
 }
\ No newline at end of file
-- 
cgit 


From 996feefe717ac623daabaadda71b5b9d2bbe1cf1 Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Mon, 16 Mar 2020 14:33:38 +0100
Subject: Rename Documentables to avoid name conflicts

---
 core/src/main/kotlin/DokkaGenerator.kt             |  12 +-
 core/src/main/kotlin/model/Documentable.kt         | 190 ++++++++++-----------
 .../main/kotlin/model/documentableProperties.kt    |   6 +-
 .../DescriptorToDocumentableTranslator.kt          |   4 +-
 .../documentation/DocumentableMerger.kt            |   4 +-
 .../documentation/DocumentableToPageTranslator.kt  |   4 +-
 .../documentation/DocumentableTransformer.kt       |   4 +-
 .../psi/PsiToDocumentableTranslator.kt             |   4 +-
 .../src/main/kotlin/renderers/html/HtmlRenderer.kt |   4 +-
 .../kotlin/signatures/KotlinSignatureProvider.kt   |  35 ++--
 .../documentables/DefaultDocumentableMerger.kt     | 116 ++++++-------
 .../DefaultDescriptorToDocumentableTranslator.kt   |  78 +++++----
 .../DefaultDocumentableToPageTranslator.kt         |   4 +-
 .../documentables/DefaultPageCreator.kt            |  18 +-
 .../psi/DefaultPsiToDocumentableTranslator.kt      |  40 ++---
 plugins/base/src/test/kotlin/enums/EnumsTest.kt    |   5 +-
 plugins/base/src/test/kotlin/issues/IssuesTest.kt  |  18 +-
 plugins/base/src/test/kotlin/markdown/KDocTest.kt  |   4 +-
 plugins/base/src/test/kotlin/model/ClassesTest.kt  |  60 +++----
 plugins/base/src/test/kotlin/model/CommentTest.kt  |  32 ++--
 .../base/src/test/kotlin/model/FunctionsTest.kt    |  18 +-
 plugins/base/src/test/kotlin/model/JavaTest.kt     |  38 ++---
 plugins/base/src/test/kotlin/model/PackagesTest.kt |  16 +-
 plugins/base/src/test/kotlin/model/PropertyTest.kt |  20 +--
 plugins/base/src/test/kotlin/utils/ModelUtils.kt   |   6 +-
 plugins/base/src/test/kotlin/utils/TestUtils.kt    |   8 +-
 .../kotlin/converters/KotlinToJavaConverter.kt     |  54 +++---
 .../kotlin/signatures/JavaSignatureProvider.kt     |  34 ++--
 .../KotlinAsJavaDocumentableTransformer.kt         |   4 +-
 .../main/kotlin/testApi/testRunner/TestRunner.kt   |  14 +-
 30 files changed, 422 insertions(+), 432 deletions(-)

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/core/src/main/kotlin/DokkaGenerator.kt b/core/src/main/kotlin/DokkaGenerator.kt
index 1a0822d7..a3f72220 100644
--- a/core/src/main/kotlin/DokkaGenerator.kt
+++ b/core/src/main/kotlin/DokkaGenerator.kt
@@ -5,7 +5,7 @@ import com.intellij.psi.PsiJavaFile
 import com.intellij.psi.PsiManager
 import org.jetbrains.dokka.analysis.AnalysisEnvironment
 import org.jetbrains.dokka.analysis.DokkaResolutionFacade
-import org.jetbrains.dokka.model.Module
+import org.jetbrains.dokka.model.DModule
 import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.pages.RootPageNode
 import org.jetbrains.dokka.plugability.DokkaContext
@@ -76,17 +76,17 @@ class DokkaGenerator(
             platforms.map { (pdata, _) -> translatePsi(pdata, context) }
 
     fun mergeDocumentationModels(
-        modulesFromPlatforms: List<Module>,
+        modulesFromPlatforms: List<DModule>,
         context: DokkaContext
     ) = context.single(CoreExtensions.documentableMerger).invoke(modulesFromPlatforms, context)
 
     fun transformDocumentationModel(
-        documentationModel: Module,
+        documentationModel: DModule,
         context: DokkaContext
     ) = context[CoreExtensions.documentableTransformer].fold(documentationModel) { acc, t -> t(acc, context) }
 
     fun createPages(
-        transformedDocumentation: Module,
+        transformedDocumentation: DModule,
         context: DokkaContext
     ) = context.single(CoreExtensions.documentableToPageTranslator).invoke(transformedDocumentation)
 
@@ -119,7 +119,7 @@ class DokkaGenerator(
             EnvironmentAndFacade(environment, facade)
         }
 
-    private fun translateDescriptors(platformData: PlatformData, context: DokkaContext): Module {
+    private fun translateDescriptors(platformData: PlatformData, context: DokkaContext): DModule {
         val (environment, facade) = context.platforms.getValue(platformData)
 
         val packageFragments = environment.getSourceFiles().asSequence()
@@ -132,7 +132,7 @@ class DokkaGenerator(
             .invoke(platformData.name, packageFragments, platformData)
     }
 
-    private fun translatePsi(platformData: PlatformData, context: DokkaContext): Module {
+    private fun translatePsi(platformData: PlatformData, context: DokkaContext): DModule {
         val (environment, _) = context.platforms.getValue(platformData)
 
         val sourceRoots = environment.configuration.get(CLIConfigurationKeys.CONTENT_ROOTS)
diff --git a/core/src/main/kotlin/model/Documentable.kt b/core/src/main/kotlin/model/Documentable.kt
index b697f4e4..22930bf2 100644
--- a/core/src/main/kotlin/model/Documentable.kt
+++ b/core/src/main/kotlin/model/Documentable.kt
@@ -48,9 +48,9 @@ interface WithExpectActual {
 }
 
 interface WithScope {
-    val functions: List<Function>
-    val properties: List<Property>
-    val classlikes: List<Classlike>
+    val functions: List<DFunction>
+    val properties: List<DProperty>
+    val classlikes: List<DClasslike>
 }
 
 interface WithVisibility {
@@ -81,15 +81,15 @@ sealed class JavaModifier(name: String) : Modifier(name) {
 }
 
 interface WithCompanion {
-    val companion: Object?
+    val companion: DObject?
 }
 
 interface WithConstructors {
-    val constructors: List<Function>
+    val constructors: List<DFunction>
 }
 
 interface WithGenerics {
-    val generics: List<TypeParameter>
+    val generics: List<DTypeParameter>
 }
 
 interface WithSupertypes {
@@ -97,232 +97,232 @@ interface WithSupertypes {
 }
 
 interface Callable : WithVisibility, WithType, WithAbstraction, WithExpectActual {
-    val receiver: Parameter?
+    val receiver: DParameter?
 }
 
-abstract class Classlike : Documentable(), WithScope, WithVisibility, WithExpectActual
+abstract class DClasslike : Documentable(), WithScope, WithVisibility, WithExpectActual
 
-data class Module(
+data class DModule(
     override val name: String,
-    val packages: List<Package>,
+    val packages: List<DPackage>,
     override val documentation: PlatformDependent<DocumentationNode>,
     override val platformData: List<PlatformData>,
-    override val extra: PropertyContainer<Module> = PropertyContainer.empty()
-) : Documentable(), WithExtraProperties<Module> {
+    override val extra: PropertyContainer<DModule> = PropertyContainer.empty()
+) : Documentable(), WithExtraProperties<DModule> {
     override val dri: DRI = DRI.topLevel
     override val children: List<Documentable>
         get() = packages
 
-    override fun withNewExtras(newExtras: PropertyContainer<Module>) = copy(extra = newExtras)
+    override fun withNewExtras(newExtras: PropertyContainer<DModule>) = copy(extra = newExtras)
 }
 
-data class Package(
+data class DPackage(
     override val dri: DRI,
-    override val functions: List<Function>,
-    override val properties: List<Property>,
-    override val classlikes: List<Classlike>,
+    override val functions: List<DFunction>,
+    override val properties: List<DProperty>,
+    override val classlikes: List<DClasslike>,
     override val documentation: PlatformDependent<DocumentationNode>,
     override val platformData: List<PlatformData>,
-    override val extra: PropertyContainer<Package> = PropertyContainer.empty()
-) : Documentable(), WithScope, WithExtraProperties<Package> {
+    override val extra: PropertyContainer<DPackage> = PropertyContainer.empty()
+) : Documentable(), WithScope, WithExtraProperties<DPackage> {
     override val name = dri.packageName.orEmpty()
     override val children: List<Documentable>
         get() = (properties + functions + classlikes) as List<Documentable>
 
-    override fun withNewExtras(newExtras: PropertyContainer<Package>) = copy(extra = newExtras)
+    override fun withNewExtras(newExtras: PropertyContainer<DPackage>) = copy(extra = newExtras)
 }
 
-data class Class(
+data class DClass(
     override val dri: DRI,
     override val name: String,
-    override val constructors: List<Function>,
-    override val functions: List<Function>,
-    override val properties: List<Property>,
-    override val classlikes: List<Classlike>,
+    override val constructors: List<DFunction>,
+    override val functions: List<DFunction>,
+    override val properties: List<DProperty>,
+    override val classlikes: List<DClasslike>,
     override val sources: PlatformDependent<DocumentableSource>,
     override val visibility: PlatformDependent<Visibility>,
-    override val companion: Object?,
-    override val generics: List<TypeParameter>,
+    override val companion: DObject?,
+    override val generics: List<DTypeParameter>,
     override val supertypes: PlatformDependent<List<DRI>>,
     override val documentation: PlatformDependent<DocumentationNode>,
     override val modifier: Modifier,
     override val platformData: List<PlatformData>,
-    override val extra: PropertyContainer<Class> = PropertyContainer.empty()
-) : Classlike(), WithAbstraction, WithCompanion, WithConstructors, WithGenerics, WithSupertypes,
-    WithExtraProperties<Class> {
+    override val extra: PropertyContainer<DClass> = PropertyContainer.empty()
+) : DClasslike(), WithAbstraction, WithCompanion, WithConstructors, WithGenerics, WithSupertypes,
+    WithExtraProperties<DClass> {
 
     override val children: List<Documentable>
         get() = (functions + properties + classlikes + constructors) as List<Documentable>
 
-    override fun withNewExtras(newExtras: PropertyContainer<Class>) = copy(extra = newExtras)
+    override fun withNewExtras(newExtras: PropertyContainer<DClass>) = copy(extra = newExtras)
 }
 
-data class Enum(
+data class DEnum(
     override val dri: DRI,
     override val name: String,
-    val entries: List<EnumEntry>,
+    val entries: List<DEnumEntry>,
     override val documentation: PlatformDependent<DocumentationNode>,
     override val sources: PlatformDependent<DocumentableSource>,
-    override val functions: List<Function>,
-    override val properties: List<Property>,
-    override val classlikes: List<Classlike>,
+    override val functions: List<DFunction>,
+    override val properties: List<DProperty>,
+    override val classlikes: List<DClasslike>,
     override val visibility: PlatformDependent<Visibility>,
-    override val companion: Object?,
-    override val constructors: List<Function>,
+    override val companion: DObject?,
+    override val constructors: List<DFunction>,
     override val supertypes: PlatformDependent<List<DRI>>,
     override val platformData: List<PlatformData>,
-    override val extra: PropertyContainer<Enum> = PropertyContainer.empty()
-) : Classlike(), WithCompanion, WithConstructors, WithSupertypes, WithExtraProperties<Enum> {
+    override val extra: PropertyContainer<DEnum> = PropertyContainer.empty()
+) : DClasslike(), WithCompanion, WithConstructors, WithSupertypes, WithExtraProperties<DEnum> {
     override val children: List<Documentable>
         get() = (entries + functions + properties + classlikes + constructors) as List<Documentable>
 
-    override fun withNewExtras(newExtras: PropertyContainer<Enum>) = copy(extra = newExtras)
+    override fun withNewExtras(newExtras: PropertyContainer<DEnum>) = copy(extra = newExtras)
 }
 
-data class EnumEntry(
+data class DEnumEntry(
     override val dri: DRI,
     override val name: String,
     override val documentation: PlatformDependent<DocumentationNode>,
-    override val functions: List<Function>,
-    override val properties: List<Property>,
-    override val classlikes: List<Classlike>,
+    override val functions: List<DFunction>,
+    override val properties: List<DProperty>,
+    override val classlikes: List<DClasslike>,
     override val platformData: List<PlatformData>,
-    override val extra: PropertyContainer<EnumEntry> = PropertyContainer.empty()
-) : Documentable(), WithScope, WithExtraProperties<EnumEntry> {
+    override val extra: PropertyContainer<DEnumEntry> = PropertyContainer.empty()
+) : Documentable(), WithScope, WithExtraProperties<DEnumEntry> {
     override val children: List<Documentable>
         get() = (functions + properties + classlikes) as List<Documentable>
 
-    override fun withNewExtras(newExtras: PropertyContainer<EnumEntry>) = copy(extra = newExtras)
+    override fun withNewExtras(newExtras: PropertyContainer<DEnumEntry>) = copy(extra = newExtras)
 }
 
-data class Function(
+data class DFunction(
     override val dri: DRI,
     override val name: String,
     val isConstructor: Boolean,
-    val parameters: List<Parameter>,
+    val parameters: List<DParameter>,
     override val documentation: PlatformDependent<DocumentationNode>,
     override val sources: PlatformDependent<DocumentableSource>,
     override val visibility: PlatformDependent<Visibility>,
     override val type: Bound,
-    override val generics: List<TypeParameter>,
-    override val receiver: Parameter?,
+    override val generics: List<DTypeParameter>,
+    override val receiver: DParameter?,
     override val modifier: Modifier,
     override val platformData: List<PlatformData>,
-    override val extra: PropertyContainer<Function> = PropertyContainer.empty()
-) : Documentable(), Callable, WithGenerics, WithExtraProperties<Function> {
+    override val extra: PropertyContainer<DFunction> = PropertyContainer.empty()
+) : Documentable(), Callable, WithGenerics, WithExtraProperties<DFunction> {
     override val children: List<Documentable>
         get() = parameters
 
-    override fun withNewExtras(newExtras: PropertyContainer<Function>) = copy(extra = newExtras)
+    override fun withNewExtras(newExtras: PropertyContainer<DFunction>) = copy(extra = newExtras)
 }
 
-data class Interface(
+data class DInterface(
     override val dri: DRI,
     override val name: String,
     override val documentation: PlatformDependent<DocumentationNode>,
     override val sources: PlatformDependent<DocumentableSource>,
-    override val functions: List<Function>,
-    override val properties: List<Property>,
-    override val classlikes: List<Classlike>,
+    override val functions: List<DFunction>,
+    override val properties: List<DProperty>,
+    override val classlikes: List<DClasslike>,
     override val visibility: PlatformDependent<Visibility>,
-    override val companion: Object?,
-    override val generics: List<TypeParameter>,
+    override val companion: DObject?,
+    override val generics: List<DTypeParameter>,
     override val supertypes: PlatformDependent<List<DRI>>,
     override val platformData: List<PlatformData>,
-    override val extra: PropertyContainer<Interface> = PropertyContainer.empty()
-) : Classlike(), WithCompanion, WithGenerics, WithSupertypes, WithExtraProperties<Interface> {
+    override val extra: PropertyContainer<DInterface> = PropertyContainer.empty()
+) : DClasslike(), WithCompanion, WithGenerics, WithSupertypes, WithExtraProperties<DInterface> {
     override val children: List<Documentable>
         get() = (functions + properties + classlikes) as List<Documentable>
 
-    override fun withNewExtras(newExtras: PropertyContainer<Interface>) = copy(extra = newExtras)
+    override fun withNewExtras(newExtras: PropertyContainer<DInterface>) = copy(extra = newExtras)
 }
 
-data class Object(
+data class DObject(
     override val name: String?,
     override val dri: DRI,
     override val documentation: PlatformDependent<DocumentationNode>,
     override val sources: PlatformDependent<DocumentableSource>,
-    override val functions: List<Function>,
-    override val properties: List<Property>,
-    override val classlikes: List<Classlike>,
+    override val functions: List<DFunction>,
+    override val properties: List<DProperty>,
+    override val classlikes: List<DClasslike>,
     override val visibility: PlatformDependent<Visibility>,
     override val supertypes: PlatformDependent<List<DRI>>,
     override val platformData: List<PlatformData>,
-    override val extra: PropertyContainer<Object> = PropertyContainer.empty()
-) : Classlike(), WithSupertypes, WithExtraProperties<Object> {
+    override val extra: PropertyContainer<DObject> = PropertyContainer.empty()
+) : DClasslike(), WithSupertypes, WithExtraProperties<DObject> {
     override val children: List<Documentable>
         get() = (functions + properties + classlikes) as List<Documentable>
 
-    override fun withNewExtras(newExtras: PropertyContainer<Object>) = copy(extra = newExtras)
+    override fun withNewExtras(newExtras: PropertyContainer<DObject>) = copy(extra = newExtras)
 }
 
-data class Annotation(
+data class DAnnotation(
     override val name: String,
     override val dri: DRI,
     override val documentation: PlatformDependent<DocumentationNode>,
     override val sources: PlatformDependent<DocumentableSource>,
-    override val functions: List<Function>,
-    override val properties: List<Property>,
-    override val classlikes: List<Classlike>,
+    override val functions: List<DFunction>,
+    override val properties: List<DProperty>,
+    override val classlikes: List<DClasslike>,
     override val visibility: PlatformDependent<Visibility>,
-    override val companion: Object?,
-    override val constructors: List<Function>,
+    override val companion: DObject?,
+    override val constructors: List<DFunction>,
     override val platformData: List<PlatformData>,
-    override val extra: PropertyContainer<Annotation> = PropertyContainer.empty()
-) : Classlike(), WithCompanion, WithConstructors, WithExtraProperties<Annotation> {
+    override val extra: PropertyContainer<DAnnotation> = PropertyContainer.empty()
+) : DClasslike(), WithCompanion, WithConstructors, WithExtraProperties<DAnnotation> {
     override val children: List<Documentable>
         get() = (functions + properties + classlikes + constructors) as List<Documentable>
 
-    override fun withNewExtras(newExtras: PropertyContainer<Annotation>) = copy(extra = newExtras)
+    override fun withNewExtras(newExtras: PropertyContainer<DAnnotation>) = copy(extra = newExtras)
 }
 
-data class Property(
+data class DProperty(
     override val dri: DRI,
     override val name: String,
     override val documentation: PlatformDependent<DocumentationNode>,
     override val sources: PlatformDependent<DocumentableSource>,
     override val visibility: PlatformDependent<Visibility>,
     override val type: Bound,
-    override val receiver: Parameter?,
-    val setter: Function?,
-    val getter: Function?,
+    override val receiver: DParameter?,
+    val setter: DFunction?,
+    val getter: DFunction?,
     override val modifier: Modifier,
     override val platformData: List<PlatformData>,
-    override val extra: PropertyContainer<Property> = PropertyContainer.empty()
-) : Documentable(), Callable, WithExtraProperties<Property> {
+    override val extra: PropertyContainer<DProperty> = PropertyContainer.empty()
+) : Documentable(), Callable, WithExtraProperties<DProperty> {
     override val children: List<Nothing>
         get() = emptyList()
 
-    override fun withNewExtras(newExtras: PropertyContainer<Property>) = copy(extra = newExtras)
+    override fun withNewExtras(newExtras: PropertyContainer<DProperty>) = copy(extra = newExtras)
 }
 
 // TODO: treat named Parameters and receivers differently
-data class Parameter(
+data class DParameter(
     override val dri: DRI,
     override val name: String?,
     override val documentation: PlatformDependent<DocumentationNode>,
     val type: Bound,
     override val platformData: List<PlatformData>,
-    override val extra: PropertyContainer<Parameter> = PropertyContainer.empty()
-) : Documentable(), WithExtraProperties<Parameter> {
+    override val extra: PropertyContainer<DParameter> = PropertyContainer.empty()
+) : Documentable(), WithExtraProperties<DParameter> {
     override val children: List<Nothing>
         get() = emptyList()
 
-    override fun withNewExtras(newExtras: PropertyContainer<Parameter>) = copy(extra = newExtras)
+    override fun withNewExtras(newExtras: PropertyContainer<DParameter>) = copy(extra = newExtras)
 }
 
-data class TypeParameter(
+data class DTypeParameter(
     override val dri: DRI,
     override val name: String,
     override val documentation: PlatformDependent<DocumentationNode>,
     val bounds: List<Bound>,
     override val platformData: List<PlatformData>,
-    override val extra: PropertyContainer<TypeParameter> = PropertyContainer.empty()
-) : Documentable(), WithExtraProperties<TypeParameter> {
+    override val extra: PropertyContainer<DTypeParameter> = PropertyContainer.empty()
+) : Documentable(), WithExtraProperties<DTypeParameter> {
     override val children: List<Nothing>
         get() = emptyList()
 
-    override fun withNewExtras(newExtras: PropertyContainer<TypeParameter>) = copy(extra = newExtras)
+    override fun withNewExtras(newExtras: PropertyContainer<DTypeParameter>) = copy(extra = newExtras)
 }
 
 sealed class Projection
diff --git a/core/src/main/kotlin/model/documentableProperties.kt b/core/src/main/kotlin/model/documentableProperties.kt
index 38a06451..67e5e88d 100644
--- a/core/src/main/kotlin/model/documentableProperties.kt
+++ b/core/src/main/kotlin/model/documentableProperties.kt
@@ -3,12 +3,12 @@ package org.jetbrains.dokka.model
 import org.jetbrains.dokka.model.properties.ExtraProperty
 import org.jetbrains.dokka.model.properties.MergeStrategy
 
-data class InheritedFunction(val isInherited: Boolean): ExtraProperty<Function> {
-    object InheritedFunctionKey: ExtraProperty.Key<Function, Boolean> {
+data class InheritedFunction(val isInherited: Boolean): ExtraProperty<DFunction> {
+    object InheritedFunctionKey: ExtraProperty.Key<DFunction, Boolean> {
         override fun mergeStrategyFor(left: Boolean, right: Boolean) = MergeStrategy.Fail {
             throw IllegalArgumentException("Function inheritance should be consistent!")
         }
     }
-    override val key: ExtraProperty.Key<Function, Boolean> =
+    override val key: ExtraProperty.Key<DFunction, Boolean> =
         InheritedFunctionKey
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/transformers/descriptors/DescriptorToDocumentableTranslator.kt b/core/src/main/kotlin/transformers/descriptors/DescriptorToDocumentableTranslator.kt
index d72eeafd..ca66b90a 100644
--- a/core/src/main/kotlin/transformers/descriptors/DescriptorToDocumentableTranslator.kt
+++ b/core/src/main/kotlin/transformers/descriptors/DescriptorToDocumentableTranslator.kt
@@ -1,6 +1,6 @@
 package org.jetbrains.dokka.transformers.descriptors
 
-import org.jetbrains.dokka.model.Module
+import org.jetbrains.dokka.model.DModule
 import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 
@@ -9,5 +9,5 @@ interface DescriptorToDocumentableTranslator {
         moduleName: String,
         packageFragments: Iterable<PackageFragmentDescriptor>,
         platformData: PlatformData
-    ): Module
+    ): DModule
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt b/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt
index 5a17bc24..c8ae9c02 100644
--- a/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt
+++ b/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt
@@ -1,8 +1,8 @@
 package org.jetbrains.dokka.transformers.documentation
 
-import org.jetbrains.dokka.model.Module
+import org.jetbrains.dokka.model.DModule
 import org.jetbrains.dokka.plugability.DokkaContext
 
 interface DocumentableMerger {
-    operator fun invoke(modules: Collection<Module>, context: DokkaContext): Module
+    operator fun invoke(modules: Collection<DModule>, context: DokkaContext): DModule
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/transformers/documentation/DocumentableToPageTranslator.kt b/core/src/main/kotlin/transformers/documentation/DocumentableToPageTranslator.kt
index e41e0c84..83456f01 100644
--- a/core/src/main/kotlin/transformers/documentation/DocumentableToPageTranslator.kt
+++ b/core/src/main/kotlin/transformers/documentation/DocumentableToPageTranslator.kt
@@ -1,8 +1,8 @@
 package org.jetbrains.dokka.transformers.documentation
 
-import org.jetbrains.dokka.model.Module
+import org.jetbrains.dokka.model.DModule
 import org.jetbrains.dokka.pages.ModulePageNode
 
 interface DocumentableToPageTranslator {
-    operator fun invoke(module: Module): ModulePageNode
+    operator fun invoke(module: DModule): ModulePageNode
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/transformers/documentation/DocumentableTransformer.kt b/core/src/main/kotlin/transformers/documentation/DocumentableTransformer.kt
index 88a1514d..3eb4704e 100644
--- a/core/src/main/kotlin/transformers/documentation/DocumentableTransformer.kt
+++ b/core/src/main/kotlin/transformers/documentation/DocumentableTransformer.kt
@@ -1,8 +1,8 @@
 package org.jetbrains.dokka.transformers.documentation
 
-import org.jetbrains.dokka.model.Module
+import org.jetbrains.dokka.model.DModule
 import org.jetbrains.dokka.plugability.DokkaContext
 
 interface DocumentableTransformer {
-    operator fun invoke(original: Module, context: DokkaContext): Module
+    operator fun invoke(original: DModule, context: DokkaContext): DModule
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/transformers/psi/PsiToDocumentableTranslator.kt b/core/src/main/kotlin/transformers/psi/PsiToDocumentableTranslator.kt
index 1ea07ff3..6f5025bd 100644
--- a/core/src/main/kotlin/transformers/psi/PsiToDocumentableTranslator.kt
+++ b/core/src/main/kotlin/transformers/psi/PsiToDocumentableTranslator.kt
@@ -1,7 +1,7 @@
 package org.jetbrains.dokka.transformers.psi
 
 import com.intellij.psi.PsiJavaFile
-import org.jetbrains.dokka.model.Module
+import org.jetbrains.dokka.model.DModule
 import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.plugability.DokkaContext
 
@@ -11,5 +11,5 @@ interface PsiToDocumentableTranslator {
         psiFiles: List<PsiJavaFile>,
         platformData: PlatformData,
         context: DokkaContext
-    ): Module
+    ): DModule
 }
diff --git a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
index d7b2a912..34dac9f4 100644
--- a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
+++ b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
@@ -4,7 +4,7 @@ import kotlinx.html.*
 import kotlinx.html.stream.createHTML
 import org.jetbrains.dokka.base.renderers.DefaultRenderer
 import org.jetbrains.dokka.links.DRI
-import org.jetbrains.dokka.model.Function
+import org.jetbrains.dokka.model.DFunction
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import java.io.File
@@ -269,7 +269,7 @@ private fun PageNode.pageKind() = when (this) {
     is PackagePageNode -> "package"
     is ClasslikePageNode -> "class"
     is MemberPageNode -> when (this.documentable) {
-        is Function -> "function"
+        is DFunction -> "function"
         else -> "other"
     }
     else -> "other"
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
index f600a3bf..8a080bb9 100644
--- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
+++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
@@ -6,12 +6,11 @@ import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.links.DriOfUnit
 import org.jetbrains.dokka.links.sureClassNames
 import org.jetbrains.dokka.model.*
-import org.jetbrains.dokka.model.Annotation
-import org.jetbrains.dokka.model.Enum
-import org.jetbrains.dokka.model.Function
+import org.jetbrains.dokka.model.DAnnotation
+import org.jetbrains.dokka.model.DEnum
+import org.jetbrains.dokka.model.DFunction
 import org.jetbrains.dokka.pages.ContentKind
 import org.jetbrains.dokka.pages.ContentNode
-import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.pages.TextStyle
 import org.jetbrains.dokka.utilities.DokkaLogger
 
@@ -21,26 +20,26 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
     private val ignoredVisibilities = setOf(JavaVisibility.Default, KotlinVisibility.Public)
 
     override fun signature(documentable: Documentable): ContentNode = when (documentable) {
-        is Function -> signature(documentable)
-        is Property -> signature(documentable)
-        is Classlike -> signature(documentable)
-        is TypeParameter -> signature(documentable)
+        is DFunction -> signature(documentable)
+        is DProperty -> signature(documentable)
+        is DClasslike -> signature(documentable)
+        is DTypeParameter -> signature(documentable)
         else -> throw NotImplementedError(
             "Cannot generate signature for ${documentable::class.qualifiedName} ${documentable.name}"
         )
     }
 
-    private fun signature(c: Classlike) = contentBuilder.contentFor(c, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
+    private fun signature(c: DClasslike) = contentBuilder.contentFor(c, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
         platformText(c.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
-        if (c is Class) {
+        if (c is DClass) {
             text(c.modifier.name + " ")
         }
         when (c) {
-            is Class -> text("class ")
-            is Interface -> text("interface ")
-            is Enum -> text("enum ")
-            is Object -> text("object ")
-            is Annotation -> text("annotation class ")
+            is DClass -> text("class ")
+            is DInterface -> text("interface ")
+            is DEnum -> text("enum ")
+            is DObject -> text("object ")
+            is DAnnotation -> text("annotation class ")
         }
         link(c.name!!, c.dri)
         if (c is WithSupertypes) {
@@ -52,11 +51,11 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
         }
     }
 
-    private fun signature(p: Property) = contentBuilder.contentFor(p, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
+    private fun signature(p: DProperty) = contentBuilder.contentFor(p, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
         signatureForProjection(p.type)
     }
 
-    private fun signature(f: Function) = contentBuilder.contentFor(f, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
+    private fun signature(f: DFunction) = contentBuilder.contentFor(f, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
         platformText(f.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
         text(f.modifier.name + " ")
         text("fun ")
@@ -82,7 +81,7 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
         }
     }
 
-    private fun signature(t: TypeParameter) = contentBuilder.contentFor(t) {
+    private fun signature(t: DTypeParameter) = contentBuilder.contentFor(t) {
         link(t.name, t.dri)
         list(t.bounds, prefix = " : ") {
             signatureForProjection(it)
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
index 4d47401b..bb7dbaaf 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
@@ -1,10 +1,10 @@
 package org.jetbrains.dokka.base.transformers.documentables
 
 import org.jetbrains.dokka.model.*
-import org.jetbrains.dokka.model.Enum
-import org.jetbrains.dokka.model.Function
-import org.jetbrains.dokka.model.Package
-import org.jetbrains.dokka.model.Annotation
+import org.jetbrains.dokka.model.DEnum
+import org.jetbrains.dokka.model.DFunction
+import org.jetbrains.dokka.model.DPackage
+import org.jetbrains.dokka.model.DAnnotation
 import org.jetbrains.dokka.model.properties.mergeExtras
 import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.plugability.DokkaContext
@@ -12,7 +12,7 @@ import org.jetbrains.dokka.transformers.documentation.DocumentableMerger
 import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
 
 internal object DefaultDocumentableMerger : DocumentableMerger {
-    override fun invoke(modules: Collection<Module>, context: DokkaContext): Module {
+    override fun invoke(modules: Collection<DModule>, context: DokkaContext): DModule {
         val name = modules.map { it.name }.distinct().singleOrNull() ?: run {
             context.logger.error("All module names need to be the same")
             modules.first().name
@@ -21,11 +21,11 @@ internal object DefaultDocumentableMerger : DocumentableMerger {
         return modules.reduce { left, right ->
             val list = listOf(left, right)
 
-            Module(
+            DModule(
                 name = name,
                 packages = merge(
                     list.flatMap { it.packages },
-                    Package::mergeWith
+                    DPackage::mergeWith
                 ),
                 documentation = list.platformDependentFor { documentation },
                 platformData = list.flatMap { it.platformData }.distinct()
@@ -106,25 +106,25 @@ private sealed class Expect<out T : Any> {
     }
 }
 
-fun Package.mergeWith(other: Package): Package = copy(
-    functions = mergeExpectActual(functions + other.functions, Function::mergeWith) { copy(platformData = it) },
-    properties = mergeExpectActual(properties + other.properties, Property::mergeWith) { copy(platformData = it) },
-    classlikes = mergeExpectActual(classlikes + other.classlikes, Classlike::mergeWith, Classlike::setPlatformData),
+fun DPackage.mergeWith(other: DPackage): DPackage = copy(
+    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith) { copy(platformData = it) },
+    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith) { copy(platformData = it) },
+    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith, DClasslike::setPlatformData),
     documentation = documentation.mergeWith(other.documentation),
     platformData = (platformData + other.platformData).distinct()
 ).mergeExtras(this, other)
 
-fun Function.mergeWith(other: Function): Function = copy(
-    parameters = merge(this.parameters + other.parameters, Parameter::mergeWith),
+fun DFunction.mergeWith(other: DFunction): DFunction = copy(
+    parameters = merge(this.parameters + other.parameters, DParameter::mergeWith),
     receiver = receiver?.let { r -> other.receiver?.let { r.mergeWith(it) } ?: r } ?: other.receiver,
     documentation = documentation.mergeWith(other.documentation),
     sources = sources.mergeWith(other.sources),
     visibility = visibility.mergeWith(other.visibility),
     platformData = (platformData + other.platformData).distinct(),
-    generics = merge(generics + other.generics, TypeParameter::mergeWith)
+    generics = merge(generics + other.generics, DTypeParameter::mergeWith)
 ).mergeExtras(this, other)
 
-fun Property.mergeWith(other: Property): Property = copy(
+fun DProperty.mergeWith(other: DProperty): DProperty = copy(
     receiver = receiver?.let { r -> other.receiver?.let { r.mergeWith(it) } ?: r } ?: other.receiver,
     documentation = documentation.mergeWith(other.documentation),
     sources = sources.mergeWith(other.sources),
@@ -134,33 +134,33 @@ fun Property.mergeWith(other: Property): Property = copy(
     setter = setter?.let { s -> other.setter?.let { s.mergeWith(it) } ?: s } ?: other.setter
 ).mergeExtras(this, other)
 
-fun Classlike.setPlatformData(platformData: List<PlatformData>): Classlike = when (this) {
-    is Class -> copy(platformData = platformData)
-    is Enum -> copy(platformData = platformData)
-    is Interface -> copy(platformData = platformData)
-    is Object -> copy(platformData = platformData)
+fun DClasslike.setPlatformData(platformData: List<PlatformData>): DClasslike = when (this) {
+    is DClass -> copy(platformData = platformData)
+    is DEnum -> copy(platformData = platformData)
+    is DInterface -> copy(platformData = platformData)
+    is DObject -> copy(platformData = platformData)
     else -> throw IllegalStateException("${this::class.qualifiedName} ${this.name} cannot have platform set")
 }
 
-fun Classlike.mergeWith(other: Classlike): Classlike = when {
-    this is Class && other is Class -> mergeWith(other)
-    this is Enum && other is Enum -> mergeWith(other)
-    this is Interface && other is Interface -> mergeWith(other)
-    this is Object && other is Object -> mergeWith(other)
-    this is Annotation && other is Annotation -> mergeWith(other)
+fun DClasslike.mergeWith(other: DClasslike): DClasslike = when {
+    this is DClass && other is DClass -> mergeWith(other)
+    this is DEnum && other is DEnum -> mergeWith(other)
+    this is DInterface && other is DInterface -> mergeWith(other)
+    this is DObject && other is DObject -> mergeWith(other)
+    this is DAnnotation && other is DAnnotation -> mergeWith(other)
     else -> throw IllegalStateException("${this::class.qualifiedName} ${this.name} cannot be mergesd with ${other::class.qualifiedName} ${other.name}")
 }
 
-fun Class.mergeWith(other: Class): Class = copy(
+fun DClass.mergeWith(other: DClass): DClass = copy(
     constructors = mergeExpectActual(
         constructors + other.constructors,
-        Function::mergeWith
+        DFunction::mergeWith
     ) { copy(platformData = it) },
-    functions = mergeExpectActual(functions + other.functions, Function::mergeWith) { copy(platformData = it) },
-    properties = mergeExpectActual(properties + other.properties, Property::mergeWith) { copy(platformData = it) },
-    classlikes = mergeExpectActual(classlikes + other.classlikes, Classlike::mergeWith, Classlike::setPlatformData),
+    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith) { copy(platformData = it) },
+    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith) { copy(platformData = it) },
+    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith, DClasslike::setPlatformData),
     companion = companion?.let { c -> other.companion?.let { c.mergeWith(it) } ?: c } ?: other.companion,
-    generics = merge(generics + other.generics, TypeParameter::mergeWith),
+    generics = merge(generics + other.generics, DTypeParameter::mergeWith),
     supertypes = supertypes.mergeWith(other.supertypes),
     documentation = documentation.mergeWith(other.documentation),
     sources = sources.mergeWith(other.sources),
@@ -168,15 +168,15 @@ fun Class.mergeWith(other: Class): Class = copy(
     platformData = (platformData + other.platformData).distinct()
 ).mergeExtras(this, other)
 
-fun Enum.mergeWith(other: Enum): Enum = copy(
-    entries = merge(entries + other.entries, EnumEntry::mergeWith),
+fun DEnum.mergeWith(other: DEnum): DEnum = copy(
+    entries = merge(entries + other.entries, DEnumEntry::mergeWith),
     constructors = mergeExpectActual(
         constructors + other.constructors,
-        Function::mergeWith
+        DFunction::mergeWith
     ) { copy(platformData = it) },
-    functions = mergeExpectActual(functions + other.functions, Function::mergeWith) { copy(platformData = it) },
-    properties = mergeExpectActual(properties + other.properties, Property::mergeWith) { copy(platformData = it) },
-    classlikes = mergeExpectActual(classlikes + other.classlikes, Classlike::mergeWith, Classlike::setPlatformData),
+    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith) { copy(platformData = it) },
+    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith) { copy(platformData = it) },
+    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith, DClasslike::setPlatformData),
     companion = companion?.let { c -> other.companion?.let { c.mergeWith(it) } ?: c } ?: other.companion,
     supertypes = supertypes.mergeWith(other.supertypes),
     documentation = documentation.mergeWith(other.documentation),
@@ -185,18 +185,18 @@ fun Enum.mergeWith(other: Enum): Enum = copy(
     platformData = (platformData + other.platformData).distinct()
 ).mergeExtras(this, other)
 
-fun EnumEntry.mergeWith(other: EnumEntry): EnumEntry = copy(
-    functions = mergeExpectActual(functions + other.functions, Function::mergeWith) { copy(platformData = it) },
-    properties = mergeExpectActual(properties + other.properties, Property::mergeWith) { copy(platformData = it) },
-    classlikes = mergeExpectActual(classlikes + other.classlikes, Classlike::mergeWith, Classlike::setPlatformData),
+fun DEnumEntry.mergeWith(other: DEnumEntry): DEnumEntry = copy(
+    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith) { copy(platformData = it) },
+    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith) { copy(platformData = it) },
+    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith, DClasslike::setPlatformData),
     documentation = documentation.mergeWith(other.documentation),
     platformData = (platformData + other.platformData).distinct()
 ).mergeExtras(this, other)
 
-fun Object.mergeWith(other: Object): Object = copy(
-    functions = mergeExpectActual(functions + other.functions, Function::mergeWith) { copy(platformData = it) },
-    properties = mergeExpectActual(properties + other.properties, Property::mergeWith) { copy(platformData = it) },
-    classlikes = mergeExpectActual(classlikes + other.classlikes, Classlike::mergeWith, Classlike::setPlatformData),
+fun DObject.mergeWith(other: DObject): DObject = copy(
+    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith) { copy(platformData = it) },
+    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith) { copy(platformData = it) },
+    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith, DClasslike::setPlatformData),
     supertypes = supertypes.mergeWith(other.supertypes),
     documentation = documentation.mergeWith(other.documentation),
     sources = sources.mergeWith(other.sources),
@@ -204,12 +204,12 @@ fun Object.mergeWith(other: Object): Object = copy(
     platformData = (platformData + other.platformData).distinct()
 ).mergeExtras(this, other)
 
-fun Interface.mergeWith(other: Interface): Interface = copy(
-    functions = mergeExpectActual(functions + other.functions, Function::mergeWith) { copy(platformData = it) },
-    properties = mergeExpectActual(properties + other.properties, Property::mergeWith) { copy(platformData = it) },
-    classlikes = mergeExpectActual(classlikes + other.classlikes, Classlike::mergeWith, Classlike::setPlatformData),
+fun DInterface.mergeWith(other: DInterface): DInterface = copy(
+    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith) { copy(platformData = it) },
+    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith) { copy(platformData = it) },
+    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith, DClasslike::setPlatformData),
     companion = companion?.let { c -> other.companion?.let { c.mergeWith(it) } ?: c } ?: other.companion,
-    generics = merge(generics + other.generics, TypeParameter::mergeWith),
+    generics = merge(generics + other.generics, DTypeParameter::mergeWith),
     supertypes = supertypes.mergeWith(other.supertypes),
     documentation = documentation.mergeWith(other.documentation),
     sources = sources.mergeWith(other.sources),
@@ -217,14 +217,14 @@ fun Interface.mergeWith(other: Interface): Interface = copy(
     platformData = (platformData + other.platformData).distinct()
 ).mergeExtras(this, other)
 
-fun Annotation.mergeWith(other: Annotation): Annotation = copy(
+fun DAnnotation.mergeWith(other: DAnnotation): DAnnotation = copy(
     constructors = mergeExpectActual(
         constructors + other.constructors,
-        Function::mergeWith
+        DFunction::mergeWith
     ) { copy(platformData = it) },
-    functions = mergeExpectActual(functions + other.functions, Function::mergeWith) { copy(platformData = it) },
-    properties = mergeExpectActual(properties + other.properties, Property::mergeWith) { copy(platformData = it) },
-    classlikes = mergeExpectActual(classlikes + other.classlikes, Classlike::mergeWith, Classlike::setPlatformData),
+    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith) { copy(platformData = it) },
+    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith) { copy(platformData = it) },
+    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith, DClasslike::setPlatformData),
     companion = companion?.let { c -> other.companion?.let { c.mergeWith(it) } ?: c } ?: other.companion,
     documentation = documentation.mergeWith(other.documentation),
     sources = sources.mergeWith(other.sources),
@@ -232,12 +232,12 @@ fun Annotation.mergeWith(other: Annotation): Annotation = copy(
     platformData = (platformData + other.platformData).distinct()
 ).mergeExtras(this, other)
 
-fun Parameter.mergeWith(other: Parameter): Parameter = copy(
+fun DParameter.mergeWith(other: DParameter): DParameter = copy(
     documentation = documentation.mergeWith(other.documentation),
     platformData = (platformData + other.platformData).distinct()
 ).mergeExtras(this, other)
 
-fun TypeParameter.mergeWith(other: TypeParameter): TypeParameter = copy(
+fun DTypeParameter.mergeWith(other: DTypeParameter): DTypeParameter = copy(
     documentation = documentation.mergeWith(other.documentation),
     platformData = (platformData + other.platformData).distinct()
 ).mergeExtras(this, other)
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index 9a71145f..eb23ffd7 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -5,8 +5,8 @@ import org.jetbrains.dokka.links.Callable
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.links.withClass
 import org.jetbrains.dokka.model.*
-import org.jetbrains.dokka.model.Enum
-import org.jetbrains.dokka.model.Function
+import org.jetbrains.dokka.model.DEnum
+import org.jetbrains.dokka.model.DFunction
 import org.jetbrains.dokka.model.doc.DocumentationNode
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.dokka.pages.PlatformData
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBo
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.calls.components.isVararg
 import org.jetbrains.kotlin.resolve.calls.tasks.isDynamic
-import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
 import org.jetbrains.kotlin.resolve.descriptorUtil.getAllSuperclassesWithoutAny
 import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperClassNotAny
 import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperInterfaces
@@ -30,7 +29,6 @@ import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.TypeProjection
 import org.jetbrains.dokka.model.Variance
-import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf.fqName
 import org.jetbrains.kotlin.idea.kdoc.findKDoc
 
 class DefaultDescriptorToDocumentableTranslator(
@@ -47,7 +45,7 @@ class DefaultDescriptorToDocumentableTranslator(
                 DRIWithPlatformInfo(DRI.topLevel, PlatformDependent.empty())
             )
         }
-    }.let { Module(moduleName, it, PlatformDependent.empty(), listOf(platformData)) }
+    }.let { DModule(moduleName, it, PlatformDependent.empty(), listOf(platformData)) }
 
 }
 
@@ -69,11 +67,11 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
     override fun visitPackageFragmentDescriptor(
         descriptor: PackageFragmentDescriptor,
         parent: DRIWithPlatformInfo
-    ): Package {
+    ): DPackage {
         val driWithPlatform = DRI(packageName = descriptor.fqName.asString()).withEmptyInfo()
         val scope = descriptor.getMemberScope()
 
-        return Package(
+        return DPackage(
             dri = driWithPlatform.dri,
             functions = scope.functions(driWithPlatform),
             properties = scope.properties(driWithPlatform),
@@ -83,7 +81,7 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
         )
     }
 
-    override fun visitClassDescriptor(descriptor: ClassDescriptor, parent: DRIWithPlatformInfo): Classlike =
+    override fun visitClassDescriptor(descriptor: ClassDescriptor, parent: DRIWithPlatformInfo): DClasslike =
         when (descriptor.kind) {
             ClassKind.ENUM_CLASS -> enumDescriptor(descriptor, parent)
             ClassKind.OBJECT -> objectDescriptor(descriptor, parent)
@@ -91,12 +89,12 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
             else -> classDescriptor(descriptor, parent)
         }
 
-    private fun interfaceDescriptor(descriptor: ClassDescriptor, parent: DRIWithPlatformInfo): Interface {
+    private fun interfaceDescriptor(descriptor: ClassDescriptor, parent: DRIWithPlatformInfo): DInterface {
         val driWithPlatform = parent.dri.withClass(descriptor.name.asString()).withEmptyInfo()
         val scope = descriptor.unsubstitutedMemberScope
         val info = descriptor.resolveClassDescriptionData(platformData)
 
-        return Interface(
+        return DInterface(
             dri = driWithPlatform.dri,
             name = descriptor.name.asString(),
             functions = scope.functions(driWithPlatform),
@@ -113,12 +111,12 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
         )
     }
 
-    private fun objectDescriptor(descriptor: ClassDescriptor, parent: DRIWithPlatformInfo): Object {
+    private fun objectDescriptor(descriptor: ClassDescriptor, parent: DRIWithPlatformInfo): DObject {
         val driWithPlatform = parent.dri.withClass(descriptor.name.asString()).withEmptyInfo()
         val scope = descriptor.unsubstitutedMemberScope
         val info = descriptor.resolveClassDescriptionData(platformData)
 
-        return Object(
+        return DObject(
             dri = driWithPlatform.dri,
             name = descriptor.name.asString(),
             functions = scope.functions(driWithPlatform),
@@ -133,12 +131,12 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
         )
     }
 
-    private fun enumDescriptor(descriptor: ClassDescriptor, parent: DRIWithPlatformInfo): Enum {
+    private fun enumDescriptor(descriptor: ClassDescriptor, parent: DRIWithPlatformInfo): DEnum {
         val driWithPlatform = parent.dri.withClass(descriptor.name.asString()).withEmptyInfo()
         val scope = descriptor.unsubstitutedMemberScope
         val info = descriptor.resolveClassDescriptionData(platformData)
 
-        return Enum(
+        return DEnum(
             dri = driWithPlatform.dri,
             name = descriptor.name.asString(),
             entries = scope.enumEntries(driWithPlatform),
@@ -156,11 +154,11 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
         )
     }
 
-    private fun enumEntryDescriptor(descriptor: ClassDescriptor, parent: DRIWithPlatformInfo): EnumEntry {
+    private fun enumEntryDescriptor(descriptor: ClassDescriptor, parent: DRIWithPlatformInfo): DEnumEntry {
         val driWithPlatform = parent.dri.withClass(descriptor.name.asString()).withEmptyInfo()
         val scope = descriptor.unsubstitutedMemberScope
 
-        return EnumEntry(
+        return DEnumEntry(
             dri = driWithPlatform.dri,
             name = descriptor.name.asString(),
             documentation = descriptor.resolveDescriptorData(platformData),
@@ -172,13 +170,13 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
         )
     }
 
-    private fun classDescriptor(descriptor: ClassDescriptor, parent: DRIWithPlatformInfo): Class {
+    private fun classDescriptor(descriptor: ClassDescriptor, parent: DRIWithPlatformInfo): DClass {
         val driWithPlatform = parent.dri.withClass(descriptor.name.asString()).withEmptyInfo()
         val scope = descriptor.unsubstitutedMemberScope
         val info = descriptor.resolveClassDescriptionData(platformData)
         val actual = descriptor.createSources()
 
-        return Class(
+        return DClass(
             dri = driWithPlatform.dri,
             name = descriptor.name.asString(),
             constructors = descriptor.constructors.map {
@@ -203,11 +201,11 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
         )
     }
 
-    override fun visitPropertyDescriptor(descriptor: PropertyDescriptor, parent: DRIWithPlatformInfo): Property {
+    override fun visitPropertyDescriptor(descriptor: PropertyDescriptor, parent: DRIWithPlatformInfo): DProperty {
         val dri = parent.dri.copy(callable = Callable.from(descriptor))
 
         val actual = descriptor.createSources()
-        return Property(
+        return DProperty(
             dri = dri,
             name = descriptor.name.asString(),
             receiver = descriptor.extensionReceiverParameter?.let {
@@ -229,11 +227,11 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
         )
     }
 
-    override fun visitFunctionDescriptor(descriptor: FunctionDescriptor, parent: DRIWithPlatformInfo): Function {
+    override fun visitFunctionDescriptor(descriptor: FunctionDescriptor, parent: DRIWithPlatformInfo): DFunction {
         val dri = parent.dri.copy(callable = Callable.from(descriptor))
 
         val actual = descriptor.createSources()
-        return Function(
+        return DFunction(
             dri = dri,
             name = descriptor.name.asString(),
             isConstructor = false,
@@ -254,10 +252,10 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
         )
     }
 
-    override fun visitConstructorDescriptor(descriptor: ConstructorDescriptor, parent: DRIWithPlatformInfo): Function {
+    override fun visitConstructorDescriptor(descriptor: ConstructorDescriptor, parent: DRIWithPlatformInfo): DFunction {
         val dri = parent.dri.copy(callable = Callable.from(descriptor))
         val actual = descriptor.createSources()
-        return Function(
+        return DFunction(
             dri = dri,
             name = "<init>",
             isConstructor = true,
@@ -281,7 +279,7 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
     override fun visitReceiverParameterDescriptor(
         descriptor: ReceiverParameterDescriptor,
         parent: DRIWithPlatformInfo
-    ) = Parameter(
+    ) = DParameter(
         dri = parent.dri.copy(target = 0),
         name = null,
         type = descriptor.type.toBound(),
@@ -293,12 +291,12 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
         descriptor: PropertyAccessorDescriptor,
         propertyDescriptor: PropertyDescriptor,
         parent: DRI
-    ): Function {
+    ): DFunction {
         val dri = parent.copy(callable = Callable.from(descriptor))
         val isGetter = descriptor is PropertyGetterDescriptor
 
         fun PropertyDescriptor.asParameter(parent: DRI) =
-            Parameter(
+            DParameter(
                 parent.copy(target = 1),
                 this.name.asString(),
                 type = this.type.toBound(),
@@ -320,7 +318,7 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
                 listOf(propertyDescriptor.asParameter(dri))
             }
 
-        return Function(
+        return DFunction(
             dri,
             name,
             isConstructor = false,
@@ -343,7 +341,7 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
     }
 
     private fun parameter(index: Int, descriptor: ValueParameterDescriptor, parent: DRIWithPlatformInfo) =
-        Parameter(
+        DParameter(
             dri = parent.dri.copy(target = index + 1),
             name = descriptor.name.asString(),
             type = descriptor.type.toBound(),
@@ -352,28 +350,28 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
             extra = descriptor.additionalExtras()
         )
 
-    private fun MemberScope.functions(parent: DRIWithPlatformInfo): List<Function> =
+    private fun MemberScope.functions(parent: DRIWithPlatformInfo): List<DFunction> =
         getContributedDescriptors(DescriptorKindFilter.FUNCTIONS) { true }
             .filterIsInstance<FunctionDescriptor>()
             .map { visitFunctionDescriptor(it, parent) }
 
-    private fun MemberScope.properties(parent: DRIWithPlatformInfo): List<Property> =
+    private fun MemberScope.properties(parent: DRIWithPlatformInfo): List<DProperty> =
         getContributedDescriptors(DescriptorKindFilter.VALUES) { true }
             .filterIsInstance<PropertyDescriptor>()
             .map { visitPropertyDescriptor(it, parent) }
 
-    private fun MemberScope.classlikes(parent: DRIWithPlatformInfo): List<Classlike> =
+    private fun MemberScope.classlikes(parent: DRIWithPlatformInfo): List<DClasslike> =
         getContributedDescriptors(DescriptorKindFilter.CLASSIFIERS) { true }
             .filterIsInstance<ClassDescriptor>()
             .map { visitClassDescriptor(it, parent) }
-            .mapNotNull { it as? Classlike }
+            .mapNotNull { it as? DClasslike }
 
-    private fun MemberScope.packages(parent: DRIWithPlatformInfo): List<Package> =
+    private fun MemberScope.packages(parent: DRIWithPlatformInfo): List<DPackage> =
         getContributedDescriptors(DescriptorKindFilter.PACKAGES) { true }
             .filterIsInstance<PackageFragmentDescriptor>()
             .map { visitPackageFragmentDescriptor(it, parent) }
 
-    private fun MemberScope.enumEntries(parent: DRIWithPlatformInfo): List<EnumEntry> =
+    private fun MemberScope.enumEntries(parent: DRIWithPlatformInfo): List<DEnumEntry> =
         this.getContributedDescriptors(DescriptorKindFilter.CLASSIFIERS) { true }
             .filterIsInstance<ClassDescriptor>()
             .filter { it.kind == ClassKind.ENUM_ENTRY }
@@ -391,7 +389,7 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
     }
 
     private fun TypeParameterDescriptor.toTypeParameter() =
-        TypeParameter(
+        DTypeParameter(
             DRI.from(this),
             name.identifier,
             PlatformDependent.from(platformData, getDocumentation()),
@@ -428,7 +426,7 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
         MarkdownParser(resolutionFacade, this).parseFromKDocTag(it)
     }
 
-    fun ClassDescriptor.companion(dri: DRIWithPlatformInfo): Object? = companionObjectDescriptor?.let {
+    fun ClassDescriptor.companion(dri: DRIWithPlatformInfo): DObject? = companionObjectDescriptor?.let {
         objectDescriptor(it, dri)
     }
 
@@ -467,7 +465,7 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
         ExtraModifiers.OVERRIDE.takeIf { getSuperInterfaces().isNotEmpty() || getSuperClassNotAny() != null }
     ).toContainer()
 
-    fun ValueParameterDescriptor.additionalExtras(): PropertyContainer<Parameter> =
+    fun ValueParameterDescriptor.additionalExtras(): PropertyContainer<DParameter> =
         listOfNotNull(
             ExtraModifiers.DYNAMIC.takeIf { isDynamic() },
             ExtraModifiers.NOINLINE.takeIf { isNoinline },
@@ -477,13 +475,13 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
             ExtraModifiers.VARARG.takeIf { isVararg }
         ).toContainer()
 
-    fun TypeParameterDescriptor.additionalExtras(): PropertyContainer<TypeParameter> =
+    fun TypeParameterDescriptor.additionalExtras(): PropertyContainer<DTypeParameter> =
         listOfNotNull(
             ExtraModifiers.DYNAMIC.takeIf { isDynamic() },
             ExtraModifiers.REIFIED.takeIf { isReified }
         ).toContainer()
 
-    fun PropertyDescriptor.additionalExtras(): PropertyContainer<Property> = listOfNotNull(
+    fun PropertyDescriptor.additionalExtras(): PropertyContainer<DProperty> = listOfNotNull(
         ExtraModifiers.DYNAMIC.takeIf { isDynamic() },
         ExtraModifiers.CONST.takeIf { isConst },
         ExtraModifiers.LATEINIT.takeIf { isLateInit },
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultDocumentableToPageTranslator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultDocumentableToPageTranslator.kt
index 16f9b9b3..04251947 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultDocumentableToPageTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultDocumentableToPageTranslator.kt
@@ -2,7 +2,7 @@ package org.jetbrains.dokka.base.translators.documentables
 
 import org.jetbrains.dokka.base.signatures.SignatureProvider
 import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
-import org.jetbrains.dokka.model.Module
+import org.jetbrains.dokka.model.DModule
 import org.jetbrains.dokka.pages.ModulePageNode
 import org.jetbrains.dokka.transformers.documentation.DocumentableToPageTranslator
 import org.jetbrains.dokka.utilities.DokkaLogger
@@ -12,6 +12,6 @@ class DefaultDocumentableToPageTranslator(
     private val signatureProvider: SignatureProvider,
     private val logger: DokkaLogger
 ) : DocumentableToPageTranslator {
-    override fun invoke(module: Module): ModulePageNode =
+    override fun invoke(module: DModule): ModulePageNode =
         DefaultPageCreator(commentsToContentConverter, signatureProvider, logger).pageForModule(module)
 }
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index 560bda71..a0b5a072 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -4,7 +4,7 @@ import org.jetbrains.dokka.base.signatures.SignatureProvider
 import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.model.*
-import org.jetbrains.dokka.model.Function
+import org.jetbrains.dokka.model.DFunction
 import org.jetbrains.dokka.model.doc.Property
 import org.jetbrains.dokka.model.doc.TagWrapper
 import org.jetbrains.dokka.pages.*
@@ -17,16 +17,16 @@ open class DefaultPageCreator(
 ) {
     protected open val contentBuilder = PageContentBuilder(commentsToContentConverter, signatureProvider, logger)
 
-    open fun pageForModule(m: Module) =
+    open fun pageForModule(m: DModule) =
         ModulePageNode(m.name.ifEmpty { "<root>" }, contentForModule(m), m, m.packages.map(::pageForPackage))
 
-    open fun pageForPackage(p: Package): PackagePageNode = PackagePageNode(
+    open fun pageForPackage(p: DPackage): PackagePageNode = PackagePageNode(
         p.name, contentForPackage(p), setOf(p.dri), p,
         p.classlikes.map(::pageForClasslike) +
                 p.functions.map(::pageForFunction)
     )
 
-    open fun pageForClasslike(c: Classlike): ClasslikePageNode {
+    open fun pageForClasslike(c: DClasslike): ClasslikePageNode {
         val constructors = if (c is WithConstructors) c.constructors else emptyList()
 
         return ClasslikePageNode(
@@ -37,9 +37,9 @@ open class DefaultPageCreator(
         )
     }
 
-    open fun pageForFunction(f: Function) = MemberPageNode(f.name, contentForFunction(f), setOf(f.dri), f)
+    open fun pageForFunction(f: DFunction) = MemberPageNode(f.name, contentForFunction(f), setOf(f.dri), f)
 
-    protected open fun contentForModule(m: Module) = contentBuilder.contentFor(m) {
+    protected open fun contentForModule(m: DModule) = contentBuilder.contentFor(m) {
         header(1) { text(m.name) }
         block("Packages", 2, ContentKind.Packages, m.packages, m.platformData.toSet()) {
             link(it.name, it.dri)
@@ -48,7 +48,7 @@ open class DefaultPageCreator(
 //        text("Link to allpage here")
     }
 
-    protected open fun contentForPackage(p: Package) = contentBuilder.contentFor(p) {
+    protected open fun contentForPackage(p: DPackage) = contentBuilder.contentFor(p) {
         header(1) { text("Package ${p.name}") }
         +contentForScope(p, p.dri, p.platformData)
     }
@@ -87,7 +87,7 @@ open class DefaultPageCreator(
         }
     }
 
-    protected open fun contentForClasslike(c: Classlike) = contentBuilder.contentFor(c) {
+    protected open fun contentForClasslike(c: DClasslike) = contentBuilder.contentFor(c) {
         header(1) { text(c.name.orEmpty()) }
         +buildSignature(c)
 
@@ -126,7 +126,7 @@ open class DefaultPageCreator(
         }
     }.children
 
-    protected open fun contentForFunction(f: Function) = contentBuilder.contentFor(f) {
+    protected open fun contentForFunction(f: DFunction) = contentBuilder.contentFor(f) {
         header(1) { text(f.name) }
         +buildSignature(f)
         +contentForComments(f)
diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
index 65f94843..c5c72a65 100644
--- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
@@ -9,9 +9,9 @@ import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.links.JavaClassReference
 import org.jetbrains.dokka.links.withClass
 import org.jetbrains.dokka.model.*
-import org.jetbrains.dokka.model.Annotation
-import org.jetbrains.dokka.model.Enum
-import org.jetbrains.dokka.model.Function
+import org.jetbrains.dokka.model.DAnnotation
+import org.jetbrains.dokka.model.DEnum
+import org.jetbrains.dokka.model.DFunction
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.plugability.DokkaContext
@@ -31,17 +31,17 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
         psiFiles: List<PsiJavaFile>,
         platformData: PlatformData,
         context: DokkaContext
-    ): Module {
+    ): DModule {
         val docParser =
             DokkaPsiParser(
                 platformData,
                 context.logger
             )
-        return Module(
+        return DModule(
             moduleName,
             psiFiles.groupBy { it.packageName }.map { (packageName, psiFiles) ->
                 val dri = DRI(packageName = packageName)
-                Package(
+                DPackage(
                     dri,
                     emptyList(),
                     emptyList(),
@@ -93,7 +93,7 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
         private fun <T> T.toPlatformDependant() =
             PlatformDependent(mapOf(platformData to this))
 
-        fun parseClasslike(psi: PsiClass, parent: DRI): Classlike = with(psi) {
+        fun parseClasslike(psi: PsiClass, parent: DRI): DClasslike = with(psi) {
             val dri = parent.withClass(name.toString())
             val ancestorsSet = hashSetOf<DRI>()
             val superMethodsKeys = hashSetOf<Int>()
@@ -133,7 +133,7 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
             val ancestors = ancestorsSet.toList().toPlatformDependant()
             return when {
                 isAnnotationType ->
-                    Annotation(
+                    DAnnotation(
                         name.orEmpty(),
                         dri,
                         documentation,
@@ -146,11 +146,11 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
                         constructors.map { parseFunction(it, dri, true) },
                         listOf(platformData)
                     )
-                isEnum -> Enum(
+                isEnum -> DEnum(
                     dri,
                     name.orEmpty(),
                     fields.filterIsInstance<PsiEnumConstant>().map { entry ->
-                        EnumEntry(
+                        DEnumEntry(
                             dri.withClass("$name.${entry.name}"),
                             entry.name.orEmpty(),
                             javadocParser.parseDocumentation(entry).toPlatformDependant(),
@@ -171,7 +171,7 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
                     ancestors,
                     listOf(platformData)
                 )
-                isInterface -> Interface(
+                isInterface -> DInterface(
                     dri,
                     name.orEmpty(),
                     documentation,
@@ -185,7 +185,7 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
                     ancestors,
                     listOf(platformData)
                 )
-                else -> Class(
+                else -> DClass(
                     dri,
                     name.orEmpty(),
                     constructors.map { parseFunction(it, dri, true) },
@@ -209,7 +209,7 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
             parent: DRI,
             isConstructor: Boolean = false,
             isInherited: Boolean = false
-        ): Function {
+        ): DFunction {
             val dri = parent.copy(
                 callable = Callable(
                     psi.name,
@@ -218,12 +218,12 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
                         JavaClassReference(parameter.type.canonicalText)
                     })
             )
-            return Function(
+            return DFunction(
                 dri,
                 if (isConstructor) "<init>" else psi.name,
                 isConstructor,
                 psi.parameterList.parameters.mapIndexed { index, psiParameter ->
-                    Parameter(
+                    DParameter(
                         dri.copy(target = index + 1),
                         psiParameter.name,
                         javadocParser.parseDocumentation(psiParameter).toPlatformDependant(),
@@ -239,7 +239,7 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
                 null,
                 psi.getModifier(),
                 listOf(platformData),
-                PropertyContainer.empty<Function>() + InheritedFunction(
+                PropertyContainer.empty<DFunction>() + InheritedFunction(
                     isInherited
                 )
             )
@@ -278,7 +278,7 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
             else -> JavaModifier.Empty
         }
 
-        private fun PsiTypeParameterListOwner.mapTypeParameters(dri: DRI): List<TypeParameter> {
+        private fun PsiTypeParameterListOwner.mapTypeParameters(dri: DRI): List<DTypeParameter> {
             fun mapBounds(bounds: Array<JvmReferenceType>): List<Bound> =
                 if (bounds.isEmpty()) emptyList() else bounds.mapNotNull {
                     (it as? PsiClassType)?.let { classType ->
@@ -286,7 +286,7 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
                     }
                 }
             return typeParameters.mapIndexed { index, type ->
-                TypeParameter(
+                DTypeParameter(
                     dri.copy(genericTarget = index),
                     type.name.orEmpty(),
                     javadocParser.parseDocumentation(type).toPlatformDependant(),
@@ -323,7 +323,7 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
             return regularMethods to accessors
         }
 
-        private fun parseField(psi: PsiField, parent: DRI, accessors: List<PsiMethod>): Property {
+        private fun parseField(psi: PsiField, parent: DRI, accessors: List<PsiMethod>): DProperty {
             val dri = parent.copy(
                 callable = Callable(
                     psi.name!!, // TODO: Investigate if this is indeed nullable
@@ -331,7 +331,7 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
                     emptyList()
                 )
             )
-            return Property(
+            return DProperty(
                 dri,
                 psi.name!!, // TODO: Investigate if this is indeed nullable
                 javadocParser.parseDocumentation(psi).toPlatformDependant(),
diff --git a/plugins/base/src/test/kotlin/enums/EnumsTest.kt b/plugins/base/src/test/kotlin/enums/EnumsTest.kt
index ea3238a5..34e92d82 100644
--- a/plugins/base/src/test/kotlin/enums/EnumsTest.kt
+++ b/plugins/base/src/test/kotlin/enums/EnumsTest.kt
@@ -1,9 +1,8 @@
 package enums
 
-import org.jetbrains.dokka.model.Enum
+import org.jetbrains.dokka.model.DEnum
 import org.jetbrains.dokka.pages.ClasslikePageNode
 import org.jetbrains.dokka.pages.ModulePageNode
-import org.junit.Assert
 import org.junit.Assert.*
 import org.junit.Test
 import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest
@@ -72,7 +71,7 @@ class EnumsTest : AbstractCoreTest() {
                     p.first().classlikes.let { c ->
                         assertTrue("Classlikes list cannot be empty", c.isNotEmpty())
 
-                        val enum = c.first() as Enum
+                        val enum = c.first() as DEnum
                         assertEquals(enum.name, "Test")
                         assertEquals(enum.entries.count(), 2)
                         assertNotNull(enum.companion)
diff --git a/plugins/base/src/test/kotlin/issues/IssuesTest.kt b/plugins/base/src/test/kotlin/issues/IssuesTest.kt
index ea2f0f8e..e34c610a 100644
--- a/plugins/base/src/test/kotlin/issues/IssuesTest.kt
+++ b/plugins/base/src/test/kotlin/issues/IssuesTest.kt
@@ -1,7 +1,7 @@
 package issues
 
-import org.jetbrains.dokka.model.Class
-import org.jetbrains.dokka.model.Function
+import org.jetbrains.dokka.model.DClass
+import org.jetbrains.dokka.model.DFunction
 import org.junit.Test
 import utils.AbstractModelTest
 
@@ -33,16 +33,16 @@ class IssuesTest : AbstractModelTest("/src/main/kotlin/issues/Test.kt", "issues"
             |}
         """
         ) {
-            with((this / "issues" / "Test").cast<Class>()) {
+            with((this / "issues" / "Test").cast<DClass>()) {
                 // passes
-                (this / "working").cast<Function>().type.constructorFqName equals "kotlin.String"
-                (this / "doSomething").cast<Function>().type.constructorFqName equals "kotlin.String"
+                (this / "working").cast<DFunction>().type.constructorFqName equals "kotlin.String"
+                (this / "doSomething").cast<DFunction>().type.constructorFqName equals "kotlin.String"
 
                 // fails
-                (this / "brokenGenerics").cast<Function>().type.constructorFqName equals "kotlin.collections.List"
-                (this / "brokenApply").cast<Function>().type.constructorFqName equals "issues.Test"
-                (this / "brokenRun").cast<Function>().type.constructorFqName equals "issues.Test"
-                (this / "brokenLet").cast<Function>().type.constructorFqName equals "issues.Test"
+                (this / "brokenGenerics").cast<DFunction>().type.constructorFqName equals "kotlin.collections.List"
+                (this / "brokenApply").cast<DFunction>().type.constructorFqName equals "issues.Test"
+                (this / "brokenRun").cast<DFunction>().type.constructorFqName equals "issues.Test"
+                (this / "brokenLet").cast<DFunction>().type.constructorFqName equals "issues.Test"
             }
         }
     }
diff --git a/plugins/base/src/test/kotlin/markdown/KDocTest.kt b/plugins/base/src/test/kotlin/markdown/KDocTest.kt
index e250670a..fa538c3e 100644
--- a/plugins/base/src/test/kotlin/markdown/KDocTest.kt
+++ b/plugins/base/src/test/kotlin/markdown/KDocTest.kt
@@ -1,6 +1,6 @@
 package markdown
 
-import org.jetbrains.dokka.model.Package
+import org.jetbrains.dokka.model.DPackage
 import org.jetbrains.dokka.model.doc.DocumentationNode
 import org.jetbrains.dokka.pages.ModulePageNode
 import org.junit.Assert
@@ -26,7 +26,7 @@ open class KDocTest : AbstractCoreTest() {
         """.trimMargin()
 
     private fun actualDocumentationNode(modulePageNode: ModulePageNode) =
-        (modulePageNode.documentable?.children?.first() as Package)
+        (modulePageNode.documentable?.children?.first() as DPackage)
             .classlikes.single()
             .documentation.values.single()
 
diff --git a/plugins/base/src/test/kotlin/model/ClassesTest.kt b/plugins/base/src/test/kotlin/model/ClassesTest.kt
index a59174bf..d627dab4 100644
--- a/plugins/base/src/test/kotlin/model/ClassesTest.kt
+++ b/plugins/base/src/test/kotlin/model/ClassesTest.kt
@@ -2,7 +2,7 @@ package model
 
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.KotlinModifier.*
-import org.jetbrains.dokka.model.Function
+import org.jetbrains.dokka.model.DFunction
 import org.junit.Test
 import utils.AbstractModelTest
 import utils.assertNotNull
@@ -17,7 +17,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             """
             |class Klass {}"""
         ) {
-            with((this / "classes" / "Klass").cast<Class>()) {
+            with((this / "classes" / "Klass").cast<DClass>()) {
                 name equals "Klass"
                 children counts 4
             }
@@ -31,7 +31,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             |object Obj {}
             """
         ) {
-            with((this / "classes" / "Obj").cast<Object>()) {
+            with((this / "classes" / "Obj").cast<DObject>()) {
                 name equals "Obj"
                 children counts 3
             }
@@ -45,7 +45,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             |class Klass(name: String)
         """
         ) {
-            with((this / "classes" / "Klass").cast<Class>()) {
+            with((this / "classes" / "Klass").cast<DClass>()) {
                 name equals "Klass"
                 children counts 4
 
@@ -71,11 +71,11 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             |}
             """
         ) {
-            with((this / "classes" / "Klass").cast<Class>()) {
+            with((this / "classes" / "Klass").cast<DClass>()) {
                 name equals "Klass"
                 children counts 5
 
-                with((this / "fn").cast<Function>()) {
+                with((this / "fn").cast<DFunction>()) {
                     type.constructorFqName equals "kotlin.Unit"
                     parameters counts 0
                     visibility.values allEquals KotlinVisibility.Public
@@ -93,11 +93,11 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             |}
             """
         ) {
-            with((this / "classes" / "Klass").cast<Class>()) {
+            with((this / "classes" / "Klass").cast<DClass>()) {
                 name equals "Klass"
                 children counts 5
 
-                with((this / "name").cast<Property>()) {
+                with((this / "name").cast<DProperty>()) {
                     name equals "name"
                     // TODO property name
                 }
@@ -117,19 +117,19 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             |}
             """
         ) {
-            with((this / "classes" / "Klass").cast<Class>()) {
+            with((this / "classes" / "Klass").cast<DClass>()) {
                 name equals "Klass"
                 children counts 5
 
-                with((this / "Companion").cast<Object>()) {
+                with((this / "Companion").cast<DObject>()) {
                     name equals "Companion"
                     children counts 5
 
-                    with((this / "x").cast<Property>()) {
+                    with((this / "x").cast<DProperty>()) {
                         name equals "x"
                     }
 
-                    with((this / "foo").cast<Function>()) {
+                    with((this / "foo").cast<DFunction>()) {
                         name equals "foo"
                         parameters counts 0
                         type.constructorFqName equals "kotlin.Unit"
@@ -146,7 +146,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
                 |data class Klass() {}
                 """
         ) {
-            with((this / "classes" / "Klass").cast<Class>()) {
+            with((this / "classes" / "Klass").cast<DClass>()) {
                 name equals "Klass"
                 visibility.values allEquals KotlinVisibility.Public
                 with(extra[AdditionalModifiers.AdditionalKey].assertNotNull("Extras")) {
@@ -170,7 +170,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
                 |sealed class Klass() {}
                 """
         ) {
-            with((this / "classes" / "Klass").cast<Class>()) {
+            with((this / "classes" / "Klass").cast<DClass>()) {
                 name equals "Klass"
                 modifier equals KotlinModifier.Sealed
             }
@@ -215,18 +215,18 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
                 |}
                 """
         ) {
-            val C = (this / "classes" / "C").cast<Class>()
-            val D = (this / "classes" / "D").cast<Class>()
+            val C = (this / "classes" / "C").cast<DClass>()
+            val D = (this / "classes" / "D").cast<DClass>()
 
             with(C) {
                 modifier equals Open
-                with((this / "f").cast<Function>()) {
+                with((this / "f").cast<DFunction>()) {
                     modifier equals Open
                 }
             }
             with(D) {
                 modifier equals Final
-                with((this / "f").cast<Function>()) {
+                with((this / "f").cast<DFunction>()) {
                     modifier equals Open
                 }
                 D.supertypes.flatMap { it.component2() }.firstOrNull() equals C.dri
@@ -249,13 +249,13 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
                 |}
                 """
         ) {
-            val C = (this / "classes" / "C").cast<Class>()
-            val D = (this / "classes" / "D").cast<Class>()
-            val E = (this / "classes" / "E").cast<Class>()
+            val C = (this / "classes" / "C").cast<DClass>()
+            val D = (this / "classes" / "D").cast<DClass>()
+            val E = (this / "classes" / "E").cast<DClass>()
 
             with(C) {
                 modifier equals Abstract
-                ((this / "foo").cast<Function>()).modifier equals Abstract
+                ((this / "foo").cast<DFunction>()).modifier equals Abstract
             }
 
             with(D) {
@@ -280,9 +280,9 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
                 |}
                 """
         ) {
-            with((this / "classes" / "C").cast<Class>()) {
+            with((this / "classes" / "C").cast<DClass>()) {
 
-                with((this / "D").cast<Class>()) {
+                with((this / "D").cast<DClass>()) {
                 }
             }
         }
@@ -312,10 +312,10 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
                 |val Klass.Default.x: Int get() = 1
                 """
         ) {
-            with((this / "classes" / "Klass").cast<Class>()) {
+            with((this / "classes" / "Klass").cast<DClass>()) {
                 name equals "Klass"
 
-                with((this / "Default").cast<Object>()) {
+                with((this / "Default").cast<DObject>()) {
                     name equals "Default"
                     // TODO extensions
                 }
@@ -342,7 +342,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
                 |}
                 """
         ) {
-            with((this / "classes" / "C").cast<Class>()) {
+            with((this / "classes" / "C").cast<DClass>()) {
                 name equals "C"
                 constructors counts 2
 
@@ -384,14 +384,14 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
                 |}
                 """
         ) {
-            with((this / "classes" / "Klass").cast<Class>()) {
+            with((this / "classes" / "Klass").cast<DClass>()) {
                 name equals "Klass"
 
-                with((this / "Companion").cast<Object>()) {
+                with((this / "Companion").cast<DObject>()) {
                     name equals "Companion"
                     visibility.values allEquals KotlinVisibility.Private
 
-                    with((this / "fn").cast<Function>()) {
+                    with((this / "fn").cast<DFunction>()) {
                         name equals "fn"
                         parameters counts 0
                         receiver equals null
diff --git a/plugins/base/src/test/kotlin/model/CommentTest.kt b/plugins/base/src/test/kotlin/model/CommentTest.kt
index d576cf49..055892af 100644
--- a/plugins/base/src/test/kotlin/model/CommentTest.kt
+++ b/plugins/base/src/test/kotlin/model/CommentTest.kt
@@ -1,6 +1,6 @@
 package model
 
-import org.jetbrains.dokka.model.Property
+import org.jetbrains.dokka.model.DProperty
 import org.jetbrains.dokka.model.doc.CustomWrapperTag
 import org.jetbrains.dokka.model.doc.Text
 import org.junit.Test
@@ -28,7 +28,7 @@ class CommentTest : AbstractModelTest("/src/main/kotlin/comment/Test.kt", "comme
                 |val prop2 = ""
             """
         ) {
-            with((this / "comment" / "prop1").cast<Property>()) {
+            with((this / "comment" / "prop1").cast<DProperty>()) {
                 name equals "prop1"
                 with(this.docs().firstOrNull()?.root.assertNotNull("Code")) {
                     (children.firstOrNull() as? Text)
@@ -37,7 +37,7 @@ class CommentTest : AbstractModelTest("/src/main/kotlin/comment/Test.kt", "comme
                     params["lang"] equals "brainfuck"
                 }
             }
-            with((this / "comment" / "prop2").cast<Property>()) {
+            with((this / "comment" / "prop2").cast<DProperty>()) {
                 name equals "prop2"
                 comments() equals "a + b - c"
             }
@@ -51,7 +51,7 @@ class CommentTest : AbstractModelTest("/src/main/kotlin/comment/Test.kt", "comme
             val property = "test"
         """
         ) {
-            with((this / "comment" / "property").cast<Property>()) {
+            with((this / "comment" / "property").cast<DProperty>()) {
                 name equals "property"
                 comments() equals ""
             }
@@ -68,7 +68,7 @@ class CommentTest : AbstractModelTest("/src/main/kotlin/comment/Test.kt", "comme
         """
         ) {
             val p = this
-            with((this / "comment" / "property").cast<Property>()) {
+            with((this / "comment" / "property").cast<DProperty>()) {
                 comments() equals ""
             }
         }
@@ -87,7 +87,7 @@ class CommentTest : AbstractModelTest("/src/main/kotlin/comment/Test.kt", "comme
             |val property = "test"
         """
         ) {
-            with((this / "comment" / "property").cast<Property>()) {
+            with((this / "comment" / "property").cast<DProperty>()) {
                 comments() equals "doc1\ndoc2 doc3"
             }
         }
@@ -107,7 +107,7 @@ class CommentTest : AbstractModelTest("/src/main/kotlin/comment/Test.kt", "comme
             |val property = "test"
         """
         ) {
-            with((this / "comment" / "property").cast<Property>()) {
+            with((this / "comment" / "property").cast<DProperty>()) {
                 comments() equals "doc1\ndoc2 doc3"
             }
         }
@@ -121,7 +121,7 @@ class CommentTest : AbstractModelTest("/src/main/kotlin/comment/Test.kt", "comme
             |val property = "test"
         """
         ) {
-            with((this / "comment" / "property").cast<Property>()) {
+            with((this / "comment" / "property").cast<DProperty>()) {
                 comments() equals "doc"
             }
         }
@@ -136,7 +136,7 @@ class CommentTest : AbstractModelTest("/src/main/kotlin/comment/Test.kt", "comme
             |val property = "test"
         """
         ) {
-            with((this / "comment" / "property").cast<Property>()) {
+            with((this / "comment" / "property").cast<DProperty>()) {
                 comments() equals "doc"
             }
         }
@@ -151,7 +151,7 @@ class CommentTest : AbstractModelTest("/src/main/kotlin/comment/Test.kt", "comme
             |val property = "test"
         """
         ) {
-            with((this / "comment" / "property").cast<Property>()) {
+            with((this / "comment" / "property").cast<DProperty>()) {
                 comments() equals "doc"
             }
         }
@@ -168,7 +168,7 @@ class CommentTest : AbstractModelTest("/src/main/kotlin/comment/Test.kt", "comme
             |val property = "test"
         """
         ) {
-            with((this / "comment" / "property").cast<Property>()) {
+            with((this / "comment" / "property").cast<DProperty>()) {
                 comments() equals "Summary\none: []"
                 docs().find { it is CustomWrapperTag && it.name == "one" }.let {
                     with(it.assertNotNull("'one' entry")) {
@@ -188,7 +188,7 @@ class CommentTest : AbstractModelTest("/src/main/kotlin/comment/Test.kt", "comme
             |val property = "test"
         """
         ) {
-            with((this / "comment" / "property").cast<Property>()) {
+            with((this / "comment" / "property").cast<DProperty>()) {
                 comments() equals """it's "useful""""
             }
         }
@@ -205,7 +205,7 @@ class CommentTest : AbstractModelTest("/src/main/kotlin/comment/Test.kt", "comme
             |val property = "test"
         """
         ) {
-            with((this / "comment" / "property").cast<Property>()) {
+            with((this / "comment" / "property").cast<DProperty>()) {
                 comments() equals "Summary\none: [section one]"
             }
         }
@@ -224,7 +224,7 @@ class CommentTest : AbstractModelTest("/src/main/kotlin/comment/Test.kt", "comme
             |val property = "test"
         """
         ) {
-            with((this / "comment" / "property").cast<Property>()) {
+            with((this / "comment" / "property").cast<DProperty>()) {
                 comments() equals "Summary\none: [section one]\ntwo: [section two]"
             }
         }
@@ -243,7 +243,7 @@ class CommentTest : AbstractModelTest("/src/main/kotlin/comment/Test.kt", "comme
             |val property = "test"
         """
         ) {
-            with((this / "comment" / "property").cast<Property>()) {
+            with((this / "comment" / "property").cast<DProperty>()) {
                 comments() equals "Summary\none: [line one line two]"
             }
         }
@@ -290,7 +290,7 @@ class CommentTest : AbstractModelTest("/src/main/kotlin/comment/Test.kt", "comme
             |}
         """
         ) {
-            with((this / "comment" / "property").cast<Property>()) {
+            with((this / "comment" / "property").cast<DProperty>()) {
                 this
             }
         }
diff --git a/plugins/base/src/test/kotlin/model/FunctionsTest.kt b/plugins/base/src/test/kotlin/model/FunctionsTest.kt
index 9554ad02..f3a7adc7 100644
--- a/plugins/base/src/test/kotlin/model/FunctionsTest.kt
+++ b/plugins/base/src/test/kotlin/model/FunctionsTest.kt
@@ -1,7 +1,7 @@
 package model
 
-import org.jetbrains.dokka.model.Function
-import org.jetbrains.dokka.model.Package
+import org.jetbrains.dokka.model.DFunction
+import org.jetbrains.dokka.model.DPackage
 import org.junit.Test
 import utils.*
 
@@ -17,7 +17,7 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
             |fun fn() {}
         """
         ) {
-            with((this / "function" / "fn").cast<Function>()) {
+            with((this / "function" / "fn").cast<DFunction>()) {
                 name equals "fn"
                 type.constructorFqName equals "kotlin.Unit"
                 this.children.assertCount(0, "Function children: ")
@@ -39,7 +39,7 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
             |fun fn(i: Int) {}
         """
         ) {
-            with((this / "function").cast<Package>()) {
+            with((this / "function").cast<DPackage>()) {
                 val fn1 = functions.find {
                     it.name == "fn" && it.parameters.isNullOrEmpty()
                 }.assertNotNull("fn()")
@@ -76,7 +76,7 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
             |fun String.fn(x: Int) {}
         """
         ) {
-            with((this / "function").cast<Package>()) {
+            with((this / "function").cast<DPackage>()) {
                 val fn1 = functions.find {
                     it.name == "fn" && it.parameters.isNullOrEmpty()
                 }.assertNotNull("fn()")
@@ -114,7 +114,7 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
                 |}
         """
         ) {
-            with((this / "function" / "function").cast<Function>()) {
+            with((this / "function" / "function").cast<DFunction>()) {
                 comments() equals "Multiline\nFunction Documentation"
 
                 name equals "function"
@@ -141,7 +141,7 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
         ) {
             // TODO add annotations
 
-            with((this / "function" / "f").cast<Function>()) {
+            with((this / "function" / "f").cast<DFunction>()) {
                 assert(false) { "No annotation data" }
             }
         }
@@ -162,7 +162,7 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
         ) {
             // TODO add data about inline
 
-            with((this / "function" / "f").cast<Function>()) {
+            with((this / "function" / "f").cast<DFunction>()) {
                 assert(false) { "No inline data" }
             }
         }
@@ -184,7 +184,7 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
         ) {
             // TODO add data about suspend
 
-            with((this / "function" / "f").cast<Function>()) {
+            with((this / "function" / "f").cast<DFunction>()) {
                 assert(false) { "No suspend data" }
             }
         }
diff --git a/plugins/base/src/test/kotlin/model/JavaTest.kt b/plugins/base/src/test/kotlin/model/JavaTest.kt
index ea454763..c2545e7a 100644
--- a/plugins/base/src/test/kotlin/model/JavaTest.kt
+++ b/plugins/base/src/test/kotlin/model/JavaTest.kt
@@ -1,8 +1,8 @@
 package model
 
 import org.jetbrains.dokka.model.*
-import org.jetbrains.dokka.model.Enum
-import org.jetbrains.dokka.model.Function
+import org.jetbrains.dokka.model.DEnum
+import org.jetbrains.dokka.model.DFunction
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import utils.AbstractModelTest
@@ -24,10 +24,10 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             |}
             """
         ) {
-            with((this / "java" / "Test").cast<Class>()) {
+            with((this / "java" / "Test").cast<DClass>()) {
                 name equals "Test"
                 children counts 1
-                with((this / "fn").cast<Function>()) {
+                with((this / "fn").cast<DFunction>()) {
                     name equals "fn"
                     this
                 }
@@ -82,7 +82,7 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             |}
             """
         ) {
-            with((this / "java" / "Test" / "fn").cast<Function>()) {
+            with((this / "java" / "Test" / "fn").cast<DFunction>()) {
                 this
             }
         }
@@ -108,7 +108,7 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             |public class Foo extends Exception implements Cloneable {}
             """
         ) {
-            with((this / "java" / "Foo").cast<Class>()) {
+            with((this / "java" / "Foo").cast<DClass>()) {
                 val sups = listOf("Exception", "Cloneable")
                 assertTrue(
                     "Foo must extend ${sups.joinToString(", ")}",
@@ -128,11 +128,11 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             |}
             """
         ) {
-            with((this / "java" / "Test").cast<Class>()) {
+            with((this / "java" / "Test").cast<DClass>()) {
                 name equals "Test"
                 children counts 1
 
-                with((this / "arrayToString").cast<Function>()) {
+                with((this / "arrayToString").cast<DFunction>()) {
                     name equals "arrayToString"
                     type.constructorFqName equals "java.lang.String[]"
                     with(parameters.firstOrNull().assertNotNull("parameters")) {
@@ -153,7 +153,7 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             |}
             """
         ) {
-            with((this / "java" / "Foo").cast<Class>()) {
+            with((this / "java" / "Foo").cast<DClass>()) {
                 this
             }
         }
@@ -189,7 +189,7 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             |}
             """
         ) {
-            with((this / "java" / "Test").cast<Class>()) {
+            with((this / "java" / "Test").cast<DClass>()) {
                 name equals "Test"
 
                 constructors counts 2
@@ -211,9 +211,9 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             |}
             """
         ) {
-            with((this / "java" / "InnerClass").cast<Class>()) {
+            with((this / "java" / "InnerClass").cast<DClass>()) {
                 children counts 1
-                with((this / "D").cast<Class>()) {
+                with((this / "D").cast<DClass>()) {
                     name equals "D"
                     children counts 0
                 }
@@ -230,11 +230,11 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             |}
             """
         ) {
-            with((this / "java" / "Foo").cast<Class>()) {
+            with((this / "java" / "Foo").cast<DClass>()) {
                 name equals "Foo"
                 children counts 1
 
-                with((this / "bar").cast<Function>()) {
+                with((this / "bar").cast<DFunction>()) {
                     name equals "bar"
                     with(parameters.firstOrNull().assertNotNull("parameter")) {
                         name equals "x"
@@ -255,15 +255,15 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             |}
             """
         ) {
-            with((this / "java" / "Test").cast<Class>()) {
+            with((this / "java" / "Test").cast<DClass>()) {
                 children counts 2
 
-                with((this / "i").cast<Property>()) {
+                with((this / "i").cast<DProperty>()) {
                     getter.assertNotNull("i.get")
                     setter.assertNotNull("i.set")
                 }
 
-                with((this / "s").cast<Property>()) {
+                with((this / "s").cast<DProperty>()) {
                     getter.assertNotNull("s.get")
                     setter.assertNotNull("s.set")
 
@@ -344,11 +344,11 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             |}
             """
         ) {
-            with((this / "java" / "E").cast<Enum>()) {
+            with((this / "java" / "E").cast<DEnum>()) {
                 name equals "E"
                 entries counts 1
 
-                with((this / "Foo").cast<EnumEntry>()) {
+                with((this / "Foo").cast<DEnumEntry>()) {
                     name equals "Foo"
                 }
             }
diff --git a/plugins/base/src/test/kotlin/model/PackagesTest.kt b/plugins/base/src/test/kotlin/model/PackagesTest.kt
index e19cc82d..008ae14d 100644
--- a/plugins/base/src/test/kotlin/model/PackagesTest.kt
+++ b/plugins/base/src/test/kotlin/model/PackagesTest.kt
@@ -1,6 +1,6 @@
 package model
 
-import org.jetbrains.dokka.model.Package
+import org.jetbrains.dokka.model.DPackage
 import org.junit.Test
 import utils.AbstractModelTest
 
@@ -14,7 +14,7 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac
             """.trimIndent(),
             prependPackage = false
         ) {
-            with((this / "").cast<Package>()) {
+            with((this / "").cast<DPackage>()) {
                 name equals ""
                 children counts 0
             }
@@ -29,7 +29,7 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac
             """.trimIndent(),
             prependPackage = false
         ) {
-            with((this / "simple").cast<Package>()) {
+            with((this / "simple").cast<DPackage>()) {
                 name equals "simple"
                 children counts 0
             }
@@ -44,7 +44,7 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac
             """.trimIndent(),
             prependPackage = false
         ) {
-            with((this / "dot.name").cast<Package>()) {
+            with((this / "dot.name").cast<DPackage>()) {
                 name equals "dot.name"
                 children counts 0
             }
@@ -63,11 +63,11 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac
             prependPackage = false
         ) {
             children counts 2
-            with((this / "dot.name").cast<Package>()) {
+            with((this / "dot.name").cast<DPackage>()) {
                 name equals "dot.name"
                 children counts 0
             }
-            with((this / "simple").cast<Package>()) {
+            with((this / "simple").cast<DPackage>()) {
                 name equals "simple"
                 children counts 0
             }
@@ -85,7 +85,7 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac
             prependPackage = false
         ) {
             children counts 1
-            with((this / "simple").cast<Package>()) {
+            with((this / "simple").cast<DPackage>()) {
                 name equals "simple"
                 children counts 0
             }
@@ -102,7 +102,7 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac
             """.trimIndent(),
             prependPackage = false
         ) {
-            with((this / "simple.name").cast<Package>()) {
+            with((this / "simple.name").cast<DPackage>()) {
                 name equals "simple.name"
                 children counts 1
             }
diff --git a/plugins/base/src/test/kotlin/model/PropertyTest.kt b/plugins/base/src/test/kotlin/model/PropertyTest.kt
index e4ef0aec..d12e292b 100644
--- a/plugins/base/src/test/kotlin/model/PropertyTest.kt
+++ b/plugins/base/src/test/kotlin/model/PropertyTest.kt
@@ -1,8 +1,8 @@
 package model
 
 import org.jetbrains.dokka.model.KotlinVisibility
-import org.jetbrains.dokka.model.Package
-import org.jetbrains.dokka.model.Property
+import org.jetbrains.dokka.model.DPackage
+import org.jetbrains.dokka.model.DProperty
 import org.junit.Test
 import utils.AbstractModelTest
 import utils.assertNotNull
@@ -15,7 +15,7 @@ class PropertyTest : AbstractModelTest("/src/main/kotlin/property/Test.kt", "pro
             """
             |val property = "test""""
         ) {
-            with((this / "property" / "property").cast<Property>()) {
+            with((this / "property" / "property").cast<DProperty>()) {
                 name equals "property"
                 children counts 0
                 with(getter.assertNotNull("Getter")) {
@@ -33,7 +33,7 @@ class PropertyTest : AbstractModelTest("/src/main/kotlin/property/Test.kt", "pro
             |var property = "test"
             """
         ) {
-            with((this / "property" / "property").cast<Property>()) {
+            with((this / "property" / "property").cast<DProperty>()) {
                 name equals "property"
                 children counts 0
                 setter.assertNotNull("Setter")
@@ -53,7 +53,7 @@ class PropertyTest : AbstractModelTest("/src/main/kotlin/property/Test.kt", "pro
             |    get() = "test"
             """
         ) {
-            with((this / "property" / "property").cast<Property>()) {
+            with((this / "property" / "property").cast<DProperty>()) {
                 name equals "property"
                 children counts 0
                 with(getter.assertNotNull("Getter")) {
@@ -73,7 +73,7 @@ class PropertyTest : AbstractModelTest("/src/main/kotlin/property/Test.kt", "pro
             |    set(value) {}
             """
         ) {
-            with((this / "property" / "property").cast<Property>()) {
+            with((this / "property" / "property").cast<DProperty>()) {
                 name equals "property"
                 children counts 0
                 setter.assertNotNull("Setter")
@@ -93,7 +93,7 @@ class PropertyTest : AbstractModelTest("/src/main/kotlin/property/Test.kt", "pro
             |    get() = size() * 2
             """
         ) {
-            with((this / "property" / "property").cast<Property>()) {
+            with((this / "property" / "property").cast<DProperty>()) {
                 name equals "property"
                 children counts 0
                 with(receiver.assertNotNull("property receiver")) {
@@ -120,15 +120,15 @@ class PropertyTest : AbstractModelTest("/src/main/kotlin/property/Test.kt", "pro
             |}
             """
         ) {
-            with((this / "property").cast<Package>()) {
-                with((this / "Foo" / "property").cast<Property>()) {
+            with((this / "property").cast<DPackage>()) {
+                with((this / "Foo" / "property").cast<DProperty>()) {
                     name equals "property"
                     children counts 0
                     with(getter.assertNotNull("Getter")) {
                         type.constructorFqName equals "kotlin.Int"
                     }
                 }
-                with((this / "Bar" / "property").cast<Property>()) {
+                with((this / "Bar" / "property").cast<DProperty>()) {
                     name equals "property"
                     children counts 0
                     with(getter.assertNotNull("Getter")) {
diff --git a/plugins/base/src/test/kotlin/utils/ModelUtils.kt b/plugins/base/src/test/kotlin/utils/ModelUtils.kt
index 75c8e008..1e6f64c6 100644
--- a/plugins/base/src/test/kotlin/utils/ModelUtils.kt
+++ b/plugins/base/src/test/kotlin/utils/ModelUtils.kt
@@ -1,8 +1,6 @@
 package utils
 
-import org.jetbrains.dokka.model.Module
-import org.jetbrains.dokka.model.doc.DocumentationNode
-import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest
+import org.jetbrains.dokka.model.DModule
 
 abstract class AbstractModelTest(val path: String? = null, val pkg: String) : ModelDSL(), AssertDSL {
 
@@ -11,7 +9,7 @@ abstract class AbstractModelTest(val path: String? = null, val pkg: String) : Mo
         platform: String = "jvm",
         targetList: List<String> = listOf("jvm"),
         prependPackage: Boolean = true,
-        block: Module.() -> Unit
+        block: DModule.() -> Unit
     ) {
         val configuration = dokkaConfiguration {
             passes {
diff --git a/plugins/base/src/test/kotlin/utils/TestUtils.kt b/plugins/base/src/test/kotlin/utils/TestUtils.kt
index 6913ba5b..bf86c1b1 100644
--- a/plugins/base/src/test/kotlin/utils/TestUtils.kt
+++ b/plugins/base/src/test/kotlin/utils/TestUtils.kt
@@ -1,13 +1,9 @@
 package utils
 
-import org.jetbrains.dokka.model.Class
+import org.jetbrains.dokka.model.DClass
 import org.jetbrains.dokka.model.Documentable
-import org.jetbrains.dokka.model.Function
-import org.jetbrains.dokka.model.Property
 import org.jetbrains.dokka.model.doc.*
 import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest
-import kotlin.reflect.KClass
-import kotlin.reflect.full.safeCast
 
 @DslMarker
 annotation class TestDSL
@@ -64,5 +60,5 @@ fun <T> T?.assertNotNull(name: String = ""): T = this ?: throw AssertionError("$
 
 fun <T : Documentable> T?.docs() = this?.documentation.orEmpty().values.flatMap { it.children }
 
-val Class.supers
+val DClass.supers
     get() = supertypes.flatMap{it.component2()}
\ No newline at end of file
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index cf777e67..991ee07d 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -4,9 +4,9 @@ import org.jetbrains.dokka.links.Callable
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.links.withClass
 import org.jetbrains.dokka.model.*
-import org.jetbrains.dokka.model.Annotation
-import org.jetbrains.dokka.model.Enum
-import org.jetbrains.dokka.model.Function
+import org.jetbrains.dokka.model.DAnnotation
+import org.jetbrains.dokka.model.DEnum
+import org.jetbrains.dokka.model.DFunction
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
 import org.jetbrains.kotlin.name.ClassId
@@ -21,21 +21,21 @@ private fun <T : WithExpectActual> List<T>.groupedByLocation() =
             } // TODO: first() does not look reasonable
         }) { it.second }
 
-internal fun Package.asJava(): Package {
+internal fun DPackage.asJava(): DPackage {
     @Suppress("UNCHECKED_CAST")
     val syntheticClasses = ((properties + functions) as List<WithExpectActual>)
         .groupedByLocation()
         .map { (syntheticClassName, nodes) ->
-            Class(
+            DClass(
                 dri = dri.withClass(syntheticClassName),
                 name = syntheticClassName,
-                properties = nodes.filterIsInstance<Property>().map { it.asJava() },
+                properties = nodes.filterIsInstance<DProperty>().map { it.asJava() },
                 constructors = emptyList(),
                 functions = (
-                        nodes.filterIsInstance<Property>()
+                        nodes.filterIsInstance<DProperty>()
                             .map { it.javaAccessors() } +
-                                nodes.filterIsInstance<Function>()
-                                    .map { it.asJava(syntheticClassName) }) as List<Function>, // TODO: methods are static and receiver is a param
+                                nodes.filterIsInstance<DFunction>()
+                                    .map { it.asJava(syntheticClassName) }) as List<DFunction>, // TODO: methods are static and receiver is a param
                 classlikes = emptyList(),
                 sources = PlatformDependent.empty(),
                 visibility = PlatformDependent(
@@ -60,7 +60,7 @@ internal fun Package.asJava(): Package {
     )
 }
 
-internal fun Property.asJava(isTopLevel: Boolean = false, relocateToClass: String? = null) =
+internal fun DProperty.asJava(isTopLevel: Boolean = false, relocateToClass: String? = null) =
     copy(
         dri = if (relocateToClass.isNullOrBlank()) {
             dri
@@ -81,7 +81,7 @@ internal fun Property.asJava(isTopLevel: Boolean = false, relocateToClass: Strin
         extra = if (isTopLevel) extra.plus(extra.mergeAdditionalModifiers(setOf(ExtraModifiers.STATIC))) else extra
     )
 
-internal fun Property.javaAccessors(isTopLevel: Boolean = false, relocateToClass: String? = null): List<Function> =
+internal fun DProperty.javaAccessors(isTopLevel: Boolean = false, relocateToClass: String? = null): List<DFunction> =
     listOfNotNull(
         getter?.copy(
             dri = if (relocateToClass.isNullOrBlank()) {
@@ -122,7 +122,7 @@ internal fun Property.javaAccessors(isTopLevel: Boolean = false, relocateToClass
     )
 
 
-internal fun Function.asJava(containingClassName: String): Function {
+internal fun DFunction.asJava(containingClassName: String): DFunction {
     val newName = when {
         isConstructor -> containingClassName
         else -> name
@@ -137,16 +137,16 @@ internal fun Function.asJava(containingClassName: String): Function {
     ) // TODO static if toplevel
 }
 
-internal fun Classlike.asJava(): Classlike = when (this) {
-    is Class -> asJava()
-    is Enum -> asJava()
-    is Annotation -> asJava()
-    is Object -> asJava()
-    is Interface -> asJava()
+internal fun DClasslike.asJava(): DClasslike = when (this) {
+    is DClass -> asJava()
+    is DEnum -> asJava()
+    is DAnnotation -> asJava()
+    is DObject -> asJava()
+    is DInterface -> asJava()
     else -> throw IllegalArgumentException("$this shouldn't be here")
 }
 
-internal fun Class.asJava(): Class = copy(
+internal fun DClass.asJava(): DClass = copy(
     constructors = constructors.map { it.asJava(name) },
     functions = (functions + properties.map { it.getter } + properties.map { it.setter }).filterNotNull().map {
         it.asJava(name)
@@ -160,7 +160,7 @@ internal fun Class.asJava(): Class = copy(
     modifier = if (modifier is KotlinModifier.Empty) JavaModifier.Final else modifier
 )
 
-private fun TypeParameter.asJava(): TypeParameter = copy(
+private fun DTypeParameter.asJava(): DTypeParameter = copy(
     dri = dri.possiblyAsJava(),
     bounds = bounds.map { it.asJava() }
 )
@@ -175,7 +175,7 @@ private fun Bound.asJava(): Bound = when (this) {
     else -> this
 }
 
-internal fun Enum.asJava(): Enum = copy(
+internal fun DEnum.asJava(): DEnum = copy(
     constructors = constructors.map { it.asJava(name) },
     functions = (functions + properties.map { it.getter } + properties.map { it.setter }).filterNotNull().map {
         it.asJava(name)
@@ -188,12 +188,12 @@ internal fun Enum.asJava(): Enum = copy(
 //    , entries = entries.map { it.asJava() }
 )
 
-internal fun Object.asJava(): Object = copy(
+internal fun DObject.asJava(): DObject = copy(
     functions = (functions + properties.map { it.getter } + properties.map { it.setter })
         .filterNotNull()
         .map { it.asJava(name.orEmpty()) },
     properties = properties.map { it.asJava() } +
-            Property(
+            DProperty(
                 name = "INSTANCE",
                 modifier = JavaModifier.Final,
                 dri = dri.copy(callable = Callable("INSTANCE", null, emptyList())),
@@ -209,7 +209,7 @@ internal fun Object.asJava(): Object = copy(
                 getter = null,
                 platformData = platformData,
                 receiver = null,
-                extra = PropertyContainer.empty<Property>() + AdditionalModifiers(setOf(ExtraModifiers.STATIC))
+                extra = PropertyContainer.empty<DProperty>() + AdditionalModifiers(setOf(ExtraModifiers.STATIC))
             ),
     classlikes = classlikes.map { it.asJava() },
     supertypes = supertypes.copy(
@@ -217,7 +217,7 @@ internal fun Object.asJava(): Object = copy(
     )
 )
 
-internal fun Interface.asJava(): Interface = copy(
+internal fun DInterface.asJava(): DInterface = copy(
     functions = (functions + properties.map { it.getter } + properties.map { it.setter })
         .filterNotNull()
         .map { it.asJava(name) },
@@ -229,13 +229,13 @@ internal fun Interface.asJava(): Interface = copy(
     )
 )
 
-internal fun Annotation.asJava(): Annotation = copy(
+internal fun DAnnotation.asJava(): DAnnotation = copy(
     properties = properties.map { it.asJava() },
     constructors = emptyList(),
     classlikes = classlikes.map { it.asJava() }
 ) // TODO investigate if annotation class can have methods and properties not from constructor
 
-internal fun Parameter.asJava(): Parameter = copy(
+internal fun DParameter.asJava(): DParameter = copy(
     type = type.asJava(),
     name = if (name.isNullOrBlank()) "\$self" else name
 )
diff --git a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
index 55dd7a97..0ec7d0af 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
@@ -5,9 +5,9 @@ import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentCon
 import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
 import org.jetbrains.dokka.links.sureClassNames
 import org.jetbrains.dokka.model.*
-import org.jetbrains.dokka.model.Annotation
-import org.jetbrains.dokka.model.Enum
-import org.jetbrains.dokka.model.Function
+import org.jetbrains.dokka.model.DAnnotation
+import org.jetbrains.dokka.model.DEnum
+import org.jetbrains.dokka.model.DFunction
 import org.jetbrains.dokka.pages.ContentKind
 import org.jetbrains.dokka.pages.ContentNode
 import org.jetbrains.dokka.pages.TextStyle
@@ -22,28 +22,28 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
 
 
     override fun signature(documentable: Documentable): ContentNode = when (documentable) {
-        is Function -> signature(documentable)
-        is Property -> signature(documentable)
-        is Classlike -> signature(documentable)
-        is TypeParameter -> signature(documentable)
+        is DFunction -> signature(documentable)
+        is DProperty -> signature(documentable)
+        is DClasslike -> signature(documentable)
+        is DTypeParameter -> signature(documentable)
         else -> throw NotImplementedError(
             "Cannot generate signature for ${documentable::class.qualifiedName} ${documentable.name}"
         )
     }
 
-    private fun signature(c: Classlike) = contentBuilder.contentFor(c, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
+    private fun signature(c: DClasslike) = contentBuilder.contentFor(c, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
         platformText(c.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
 
-        if (c is Class) {
+        if (c is DClass) {
             text(c.modifier.takeIf { it !in ignoredModifiers }?.name.orEmpty() + " ")
         }
 
         when (c) {
-            is Class -> text("class ")
-            is Interface -> text("interface ")
-            is Enum -> text("enum ")
-            is Object -> text("class ")
-            is Annotation -> text("@interface ")
+            is DClass -> text("class ")
+            is DInterface -> text("interface ")
+            is DEnum -> text("enum ")
+            is DObject -> text("class ")
+            is DAnnotation -> text("@interface ")
         }
         link(c.name!!, c.dri)
         if (c is WithGenerics) {
@@ -60,11 +60,11 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
         }
     }
 
-    private fun signature(p: Property) = contentBuilder.contentFor(p, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
+    private fun signature(p: DProperty) = contentBuilder.contentFor(p, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
         signatureForProjection(p.type)
     }
 
-    private fun signature(f: Function) = contentBuilder.contentFor(f, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
+    private fun signature(f: DFunction) = contentBuilder.contentFor(f, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
         text(f.modifier.takeIf { it !in ignoredModifiers }?.name.orEmpty() + " ")
         val returnType = f.type
         signatureForProjection(returnType)
@@ -82,7 +82,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
         text(")")
     }
 
-    private fun signature(t: TypeParameter) = contentBuilder.contentFor(t) {
+    private fun signature(t: DTypeParameter) = contentBuilder.contentFor(t) {
         text(t.name.substringAfterLast("."))
         list(t.bounds, prefix = " extends ") {
             signatureForProjection(it)
diff --git a/plugins/kotlin-as-java/src/main/kotlin/transformers/KotlinAsJavaDocumentableTransformer.kt b/plugins/kotlin-as-java/src/main/kotlin/transformers/KotlinAsJavaDocumentableTransformer.kt
index 8f51e105..8b07670f 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/transformers/KotlinAsJavaDocumentableTransformer.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/transformers/KotlinAsJavaDocumentableTransformer.kt
@@ -1,11 +1,11 @@
 package org.jetbrains.dokka.kotlinAsJava.transformers
 
 import org.jetbrains.dokka.kotlinAsJava.converters.asJava
-import org.jetbrains.dokka.model.Module
+import org.jetbrains.dokka.model.DModule
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.transformers.documentation.DocumentableTransformer
 
 class KotlinAsJavaDocumentableTransformer : DocumentableTransformer {
-    override fun invoke(original: Module, context: DokkaContext): Module =
+    override fun invoke(original: DModule, context: DokkaContext): DModule =
         original.copy(packages = original.packages.map { it.asJava() })
 }
diff --git a/testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt b/testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt
index 641cc5f9..a0e3b709 100644
--- a/testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt
+++ b/testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt
@@ -1,7 +1,7 @@
 package org.jetbrains.dokka.testApi.testRunner
 
 import org.jetbrains.dokka.*
-import org.jetbrains.dokka.model.Module
+import org.jetbrains.dokka.model.DModule
 import org.jetbrains.dokka.pages.ModulePageNode
 import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.pages.RootPageNode
@@ -104,9 +104,9 @@ abstract class AbstractCoreTest {
     protected class TestBuilder {
         var analysisSetupStage: (Map<PlatformData, EnvironmentAndFacade>) -> Unit = {}
         var pluginsSetupStage: (DokkaContext) -> Unit = {}
-        var documentablesCreationStage: (List<Module>) -> Unit = {}
-        var documentablesMergingStage: (Module) -> Unit = {}
-        var documentablesTransformationStage: (Module) -> Unit = {}
+        var documentablesCreationStage: (List<DModule>) -> Unit = {}
+        var documentablesMergingStage: (DModule) -> Unit = {}
+        var documentablesTransformationStage: (DModule) -> Unit = {}
         var pagesGenerationStage: (ModulePageNode) -> Unit = {}
         var pagesTransformationStage: (RootPageNode) -> Unit = {}
         var renderingStage: (RootPageNode, DokkaContext) -> Unit = { a, b -> }
@@ -216,9 +216,9 @@ abstract class AbstractCoreTest {
 data class TestMethods(
     val analysisSetupStage: (Map<PlatformData, EnvironmentAndFacade>) -> Unit,
     val pluginsSetupStage: (DokkaContext) -> Unit,
-    val documentablesCreationStage: (List<Module>) -> Unit,
-    val documentablesMergingStage: (Module) -> Unit,
-    val documentablesTransformationStage: (Module) -> Unit,
+    val documentablesCreationStage: (List<DModule>) -> Unit,
+    val documentablesMergingStage: (DModule) -> Unit,
+    val documentablesTransformationStage: (DModule) -> Unit,
     val pagesGenerationStage: (ModulePageNode) -> Unit,
     val pagesTransformationStage: (RootPageNode) -> Unit,
     val renderingStage: (RootPageNode, DokkaContext) -> Unit
-- 
cgit 


From 03329b0eb98b309d208839344052633028e00984 Mon Sep 17 00:00:00 2001
From: Szymon Świstun <sswistun@virtuslab.com>
Date: Wed, 18 Mar 2020 14:19:54 +0100
Subject: Fix minor bugs and add core tests

---
 core/src/main/kotlin/model/aditionalExtras.kt      |  22 +-
 .../DefaultDescriptorToDocumentableTranslator.kt   |   2 +-
 plugins/base/src/test/kotlin/enums/EnumsTest.kt    |   6 +-
 plugins/base/src/test/kotlin/model/ClassesTest.kt  | 173 +++++------
 .../base/src/test/kotlin/model/FunctionsTest.kt    | 321 ++++++++++++---------
 .../base/src/test/kotlin/model/InheritorsTest.kt   |   4 +-
 plugins/base/src/test/kotlin/model/JavaTest.kt     | 109 +++++--
 plugins/base/src/test/kotlin/model/PropertyTest.kt |  59 +++-
 .../test/kotlin/pageMerger/PageNodeMergerTest.kt   |  10 +-
 plugins/base/src/test/kotlin/utils/TestUtils.kt    |   5 +
 .../kotlin/converters/KotlinToJavaConverter.kt     |   2 +-
 11 files changed, 431 insertions(+), 282 deletions(-)

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/core/src/main/kotlin/model/aditionalExtras.kt b/core/src/main/kotlin/model/aditionalExtras.kt
index b0755759..f7d37111 100644
--- a/core/src/main/kotlin/model/aditionalExtras.kt
+++ b/core/src/main/kotlin/model/aditionalExtras.kt
@@ -5,22 +5,34 @@ import org.jetbrains.dokka.model.properties.ExtraProperty
 import org.jetbrains.dokka.model.properties.MergeStrategy
 
 class AdditionalModifiers(val content: Set<ExtraModifiers>) : ExtraProperty<Documentable> {
-    object AdditionalKey : ExtraProperty.Key<Documentable, AdditionalModifiers> {
+    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 equals(other: Any?): Boolean =
+        if (other is AdditionalModifiers) other.content == content else false
+
     override fun hashCode() = content.hashCode()
-    override val key: ExtraProperty.Key<Documentable, *> = AdditionalKey
+    override val key: ExtraProperty.Key<Documentable, *> = AdditionalModifiers
 }
 
 class Annotations(val content: List<Annotation>) : ExtraProperty<Documentable> {
-    companion object : ExtraProperty.Key<Documentable, Annotations>
+    companion object : ExtraProperty.Key<Documentable, Annotations> {
+        override fun mergeStrategyFor(left: Annotations, right: Annotations): MergeStrategy<Documentable> =
+            MergeStrategy.Replace(Annotations((left.content + right.content).distinct()))
+    }
 
     override val key: ExtraProperty.Key<Documentable, *> = Annotations
 
-    data class Annotation(val dri: DRI, val params: Map<String, String>)
+    data class Annotation(val dri: DRI, val params: Map<String, String>) {
+        override fun equals(other: Any?): Boolean = when(other) {
+            is Annotation -> dri.equals(other.dri)
+            else -> false
+        }
+
+        override fun hashCode(): Int = dri.hashCode()
+    }
 }
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index 8e0f1231..44679d8d 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -367,7 +367,7 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
             type = descriptor.type.toBound(),
             documentation = descriptor.resolveDescriptorData(platformData),
             platformData = listOf(platformData),
-            extra = PropertyContainer.withAll(descriptor.additionalExtras())
+            extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
         )
 
     private fun MemberScope.functions(parent: DRIWithPlatformInfo): List<DFunction> =
diff --git a/plugins/base/src/test/kotlin/enums/EnumsTest.kt b/plugins/base/src/test/kotlin/enums/EnumsTest.kt
index 55ad0fbc..c9024a72 100644
--- a/plugins/base/src/test/kotlin/enums/EnumsTest.kt
+++ b/plugins/base/src/test/kotlin/enums/EnumsTest.kt
@@ -34,9 +34,9 @@ class EnumsTest : AbstractCoreTest() {
             pagesGenerationStage = {
                 val map = it.getClasslikeToMemberMap()
                 val test = map.filterKeys { it.name == "Test" }.values.firstOrNull()
-                assert(test != null) { "Test not found" }
-                assert(test!!.any { it.name == "E1" } && test.any { it.name == "E2" }) { "Enum entries missing in parent" }
-                assert(map.keys.any { it.name == "E1" } && map.keys.any { it.name == "E2" }) { "Enum entries missing" }
+                assertTrue(test != null) { "Test not found" }
+                assertTrue(test!!.any { it.name == "E1" } && test.any { it.name == "E2" }) { "Enum entries missing in parent" }
+                assertTrue(map.keys.any { it.name == "E1" } && map.keys.any { it.name == "E2" }) { "Enum entries missing" }
             }
         }
     }
diff --git a/plugins/base/src/test/kotlin/model/ClassesTest.kt b/plugins/base/src/test/kotlin/model/ClassesTest.kt
index bd35afc5..336023da 100644
--- a/plugins/base/src/test/kotlin/model/ClassesTest.kt
+++ b/plugins/base/src/test/kotlin/model/ClassesTest.kt
@@ -1,7 +1,6 @@
 package model
 
 import org.jetbrains.dokka.model.*
-import org.jetbrains.dokka.model.DFunction
 import org.jetbrains.dokka.model.KotlinModifier.*
 import org.junit.jupiter.api.Test
 import utils.AbstractModelTest
@@ -150,20 +149,14 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             with((this / "classes" / "Klass").cast<DClass>()) {
                 name equals "Klass"
                 visibility.values allEquals KotlinVisibility.Public
-                with(extra[AdditionalModifiers.AdditionalKey].assertNotNull("Extras")) {
-                    content.find { it == ExtraModifiers.DATA }.assertNotNull("data modifier")
+                with(extra[AdditionalModifiers].assertNotNull("Extras")) {
+                    content counts 1
+                    content.first() equals ExtraModifiers.DATA
                 }
             }
         }
     }
 
-//    @Test fun dataClass() {
-//        verifyPackageMember("testdata/classes/dataClass.kt", defaultModelConfig) { cls ->
-//            val modifiers = cls.details(NodeKind.Modifier).map { it.name }
-//            assertTrue("data" in modifiers)
-//        }
-//    }
-
     @Test
     fun sealedClass() {
         inlineModelTest(
@@ -178,30 +171,25 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
         }
     }
 
-//                // TODO modifiers
-//    @Test fun annotatedClassWithAnnotationParameters() {
-//        checkSourceExistsAndVerifyModel(
-//            "testdata/classes/annotatedClassWithAnnotationParameters.kt",
-//            defaultModelConfig
-//        ) { model ->
-//            with(model.members.single().members.single()) {
-//                with(deprecation!!) {
-//                    assertEquals("Deprecated", name)
-//                    assertEquals(Content.Empty, content)
-//                    assertEquals(NodeKind.Annotation, kind)
-//                    assertEquals(1, details.count())
-//                    with(details[0]) {
-//                        assertEquals(NodeKind.Parameter, kind)
-//                        assertEquals(1, details.count())
-//                        with(details[0]) {
-//                            assertEquals(NodeKind.Value, kind)
-//                            assertEquals("\"should no longer be used\"", name)
-//                        }
-//                    }
-//                }
-//            }
-//        }
-//    }
+    @Test
+    fun annotatedClassWithAnnotationParameters() {
+        inlineModelTest(
+            """
+                |@Deprecated("should no longer be used") class Foo() {}
+                """
+        ) {
+            with((this / "classes" / "Foo").cast<DClass>()) {
+                with(extra[Annotations].assertNotNull("Annotations")) {
+                    this.content counts 1
+                    with(content.first()) {
+                        dri.classNames equals "Deprecated"
+                        params.entries counts 1
+                        params["message"].assertNotNull("message") equals "should no longer be used"
+                    }
+                }
+            }
+        }
+    }
 
     @Test
     fun notOpenClass() {
@@ -272,7 +260,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
         }
     }
 
-    @Test // todo inner class
+    @Test
     fun innerClass() {
         inlineModelTest(
             """
@@ -284,21 +272,15 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             with((this / "classes" / "C").cast<DClass>()) {
 
                 with((this / "D").cast<DClass>()) {
+                    with(extra[AdditionalModifiers].assertNotNull("AdditionalModifiers")) {
+                        content counts 1
+                        content.first() equals ExtraModifiers.INNER
+                    }
                 }
             }
         }
     }
 
-//                // TODO modifiers
-//    @Test fun innerClass() {
-//        verifyPackageMember("testdata/classes/innerClass.kt", defaultModelConfig) { cls ->
-//            val innerClass = cls.members.single { it.name == "D" }
-//            val modifiers = innerClass.details(NodeKind.Modifier)
-//            assertEquals(3, modifiers.size)
-//            assertEquals("inner", modifiers[2].name)
-//        }
-//    }
-
     @Test
     fun companionObjectExtension() {
         inlineModelTest(
@@ -364,14 +346,29 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
         }
     }
 
-    // TODO modifiers
-//    @Test fun sinceKotlin() {
-//        checkSourceExistsAndVerifyModel("testdata/classes/sinceKotlin.kt", defaultModelConfig) { model ->
-//            with(model.members.single().members.single()) {
-//                assertEquals("1.1", sinceKotlin)
-//            }
-//        }
-//    }
+    @Test
+    fun sinceKotlin() {
+        inlineModelTest(
+            """
+                |/**
+                | * Useful
+                | */
+                |@SinceKotlin("1.1")
+                |class C
+                """
+        ) {
+            with((this / "classes" / "C").cast<DClass>()) {
+                with(extra[Annotations].assertNotNull("Annotations")) {
+                    this.content counts 1
+                    with(content.first()) {
+                        dri.classNames equals "SinceKotlin"
+                        params.entries counts 1
+                        params["version"].assertNotNull("version") equals "1.1"
+                    }
+                }
+            }
+        }
+    }
 
     @Test
     fun privateCompanionObject() {
@@ -402,7 +399,8 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
         }
     }
 
-    @Test fun annotatedClass() {
+    @Test
+    fun annotatedClass() {
         inlineModelTest(
             """@Suppress("abc") class Foo() {}"""
         ) {
@@ -417,47 +415,30 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
         }
     }
 
-    // TODO annotations
-//    @Test fun annotatedClass() {
-//        verifyPackageMember("testdata/classes/annotatedClass.kt", ModelConfig(
-//            analysisPlatform = analysisPlatform,
-//            withKotlinRuntime = true
-//        )
-//        ) { cls ->
-//            Assert.assertEquals(1, cls.annotations.count())
-//            with(cls.annotations[0]) {
-//                Assert.assertEquals("Strictfp", name)
-//                Assert.assertEquals(Content.Empty, content)
-//                Assert.assertEquals(NodeKind.Annotation, kind)
-//            }
-//        }
-//    }
-
-
-// TODO annotations
-
-//    @Test fun javaAnnotationClass() {
-//        checkSourceExistsAndVerifyModel(
-//            "testdata/classes/javaAnnotationClass.kt",
-//            modelConfig = ModelConfig(analysisPlatform = analysisPlatform, withJdk = true)
-//        ) { model ->
-//            with(model.members.single().members.single()) {
-//                Assert.assertEquals(1, annotations.count())
-//                with(annotations[0]) {
-//                    Assert.assertEquals("Retention", name)
-//                    Assert.assertEquals(Content.Empty, content)
-//                    Assert.assertEquals(NodeKind.Annotation, kind)
-//                    with(details[0]) {
-//                        Assert.assertEquals(NodeKind.Parameter, kind)
-//                        Assert.assertEquals(1, details.count())
-//                        with(details[0]) {
-//                            Assert.assertEquals(NodeKind.Value, kind)
-//                            Assert.assertEquals("RetentionPolicy.SOURCE", name)
-//                        }
-//                    }
-//                }
-//            }
-//        }
-//    }
+    @Test fun javaAnnotationClass() {
+        inlineModelTest(
+            """
+                |import java.lang.annotation.Retention
+                |import java.lang.annotation.RetentionPolicy
+                |
+                |@Retention(RetentionPolicy.SOURCE)
+                |public annotation class throws()
+            """
+        ) {
+            with((this / "classes" / "throws").cast<DAnnotation>()) {
+                with(extra[AdditionalModifiers].assertNotNull("AdditionalModifiers")) {
+                    content counts 1
+                    content.first() equals ExtraModifiers.OVERRIDE // ??
+                }
+                with(extra[Annotations].assertNotNull("Annotations")) {
+                    content counts 1
+                    with(content.first()) {
+                        dri.classNames equals "Retention"
+                        params["value"].assertNotNull("value") equals "(java/lang/annotation/RetentionPolicy, SOURCE)"
+                    }
+                }
+            }
+        }
+    }
 
 }
\ No newline at end of file
diff --git a/plugins/base/src/test/kotlin/model/FunctionsTest.kt b/plugins/base/src/test/kotlin/model/FunctionsTest.kt
index c8b8f2ba..068c2895 100644
--- a/plugins/base/src/test/kotlin/model/FunctionsTest.kt
+++ b/plugins/base/src/test/kotlin/model/FunctionsTest.kt
@@ -1,9 +1,11 @@
 package model
 
-import org.jetbrains.dokka.model.DFunction
-import org.jetbrains.dokka.model.DPackage
+import org.jetbrains.dokka.model.*
 import org.junit.jupiter.api.Test
-import utils.*
+import utils.AbstractModelTest
+import utils.assertNotNull
+import utils.comments
+import utils.name
 
 class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "function") {
 
@@ -130,8 +132,6 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
         }
     }
 
-// TODO add modifiers - start
-
     @Test
     fun functionWithNotDocumentedAnnotation() {
         inlineModelTest(
@@ -139,20 +139,19 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
                 |@Suppress("FOO") fun f() {}
         """
         ) {
-            // TODO add annotations
-
             with((this / "function" / "f").cast<DFunction>()) {
-                assert(false) { "No annotation data" }
+                with(extra[Annotations].assertNotNull("Annotations")) {
+                    content counts 1
+                    with(content.first()) {
+                        dri.classNames equals "Suppress"
+                        params.entries counts 1
+                        params["names"].assertNotNull("names") equals "[\"FOO\"]"
+                    }
+                }
             }
         }
     }
 
-//    @Test fun functionWithNotDocumentedAnnotation() {
-//        verifyPackageMember("testdata/functions/functionWithNotDocumentedAnnotation.kt", defaultModelConfig) { func ->
-//            assertEquals(0, func.annotations.count())
-//        }
-//    }
-
     @Test
     fun inlineFunction() {
         inlineModelTest(
@@ -160,21 +159,13 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
                 |inline fun f(a: () -> String) {}
         """
         ) {
-            // TODO add data about inline
-
             with((this / "function" / "f").cast<DFunction>()) {
-                assert(false) { "No inline data" }
+                extra[AdditionalModifiers]?.content counts 1
+                extra[AdditionalModifiers]?.content exists ExtraModifiers.INLINE
             }
         }
     }
 
-//    @Test fun inlineFunction() {
-//        verifyPackageMember("testdata/functions/inlineFunction.kt", defaultModelConfig) { func ->
-//            val modifiers = func.details(NodeKind.Modifier).map { it.name }
-//            assertTrue("inline" in modifiers)
-//        }
-//    }
-
     @Test
     fun suspendFunction() {
         inlineModelTest(
@@ -182,112 +173,167 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
                 |suspend fun f() {}
         """
         ) {
-            // TODO add data about suspend
+            with((this / "function" / "f").cast<DFunction>()) {
+                extra[AdditionalModifiers]?.content counts 1
+                extra[AdditionalModifiers]?.content exists ExtraModifiers.SUSPEND
+            }
+        }
+    }
 
+    @Test
+    fun suspendInlineFunctionOrder() {
+        inlineModelTest(
+            """
+                |suspend inline fun f(a: () -> String) {}
+        """
+        ) {
             with((this / "function" / "f").cast<DFunction>()) {
-                assert(false) { "No suspend data" }
+                extra[AdditionalModifiers]?.content counts 2
+                extra[AdditionalModifiers]?.content exists ExtraModifiers.SUSPEND
+                extra[AdditionalModifiers]?.content exists ExtraModifiers.INLINE
             }
         }
     }
 
-//    @Test fun suspendFunction() {
-//        verifyPackageMember("testdata/functions/suspendFunction.kt") { func ->
-//            val modifiers = func.details(NodeKind.Modifier).map { it.name }
-//            assertTrue("suspend" in modifiers)
-//        }
-//    }
+    @Test
+    fun inlineSuspendFunctionOrderChanged() {
+        inlineModelTest(
+            """
+                |inline suspend fun f(a: () -> String) {}
+        """
+        ) {
+            with((this / "function" / "f").cast<DFunction>()) {
+                with(extra[AdditionalModifiers].assertNotNull("AdditionalModifiers")) {
+                    content counts 2
+                    content exists ExtraModifiers.SUSPEND
+                    content exists ExtraModifiers.INLINE
+                }
+            }
+        }
+    }
 
-//    @Test fun suspendInlineFunctionOrder() {
-//        verifyPackageMember("testdata/functions/suspendInlineFunction.kt") { func ->
-//            val modifiers = func.details(NodeKind.Modifier).map { it.name }.filter {
-//                it == "suspend" || it == "inline"
-//            }
-//
-//            assertEquals(listOf("suspend", "inline"), modifiers)
-//        }
-//    }
-//
-//    @Test fun inlineSuspendFunctionOrderChanged() {
-//        verifyPackageMember("testdata/functions/inlineSuspendFunction.kt") { func ->
-//            val modifiers = func.details(NodeKind.Modifier).map { it.name }.filter {
-//                it == "suspend" || it == "inline"
-//            }
-//
-//            assertEquals(listOf("suspend", "inline"), modifiers)
-//        }
-//    }
-//
-//    @Test fun functionWithAnnotatedParam() {
-//        checkSourceExistsAndVerifyModel("testdata/functions/functionWithAnnotatedParam.kt", defaultModelConfig) { model ->
-//            with(model.members.single().members.single { it.name == "function" }) {
-//                with(details(NodeKind.Parameter).first()) {
-//                    assertEquals(1, annotations.count())
-//                    with(annotations[0]) {
-//                        assertEquals("Fancy", name)
-//                        assertEquals(Content.Empty, content)
-//                        assertEquals(NodeKind.Annotation, kind)
-//                    }
-//                }
-//            }
-//        }
-//    }
-//
-//    @Test fun functionWithNoinlineParam() {
-//        verifyPackageMember("testdata/functions/functionWithNoinlineParam.kt", defaultModelConfig) { func ->
-//            with(func.details(NodeKind.Parameter).first()) {
-//                val modifiers = details(NodeKind.Modifier).map { it.name }
-//                assertTrue("noinline" in modifiers)
-//            }
-//        }
-//    }
-//
-//    @Test fun annotatedFunctionWithAnnotationParameters() {
-//        checkSourceExistsAndVerifyModel(
-//            "testdata/functions/annotatedFunctionWithAnnotationParameters.kt",
-//            defaultModelConfig
-//        ) { model ->
-//            with(model.members.single().members.single { it.name == "f" }) {
-//                assertEquals(1, annotations.count())
-//                with(annotations[0]) {
-//                    assertEquals("Fancy", name)
-//                    assertEquals(Content.Empty, content)
-//                    assertEquals(NodeKind.Annotation, kind)
-//                    assertEquals(1, details.count())
-//                    with(details[0]) {
-//                        assertEquals(NodeKind.Parameter, kind)
-//                        assertEquals(1, details.count())
-//                        with(details[0]) {
-//                            assertEquals(NodeKind.Value, kind)
-//                            assertEquals("1", name)
-//                        }
-//                    }
-//                }
-//            }
-//        }
-//    }
+    @Test
+    fun functionWithAnnotatedParam() {
+        inlineModelTest(
+            """
+                |@Target(AnnotationTarget.VALUE_PARAMETER)
+                |@Retention(AnnotationRetention.SOURCE)
+                |@MustBeDocumented
+                |public annotation class Fancy
+                |
+                |fun function(@Fancy notInlined: () -> Unit) {}
+        """
+        ) {
+            with((this / "function" / "Fancy").cast<DAnnotation>()) {
+                with(extra[Annotations].assertNotNull("Annotations")) {
+                    content counts 3
+                    with(content.map { it.dri.classNames to it }.toMap()) {
+                        with(this["Target"].assertNotNull("Target")) {
+                            params["allowedTargets"].assertNotNull("allowedTargets") equals "[AnnotationTarget.VALUE_PARAMETER]"
+                        }
+                        with(this["Retention"].assertNotNull("Retention")) {
+                            params["value"].assertNotNull("value") equals "(kotlin/annotation/AnnotationRetention, SOURCE)"
+                        }
+                        this["MustBeDocumented"].assertNotNull("MustBeDocumented").params.entries counts 0
+                    }
+                }
+
+            }
+            with((this / "function" / "function" / "notInlined").cast<DParameter>()) {
+                with(this.extra[Annotations].assertNotNull("Annotations")) {
+                    content counts 1
+                    with(content.first()) {
+                        dri.classNames equals "Fancy"
+                        params.entries counts 0
+                    }
+                }
+            }
+        }
+    }
 
-// TODO add modifiers - end
+    @Test
+    fun functionWithNoinlineParam() {
+        inlineModelTest(
+            """
+                |fun f(noinline notInlined: () -> Unit) {}
+        """
+        ) {
+            with((this / "function" / "f" / "notInlined").cast<DParameter>()) {
+                extra[AdditionalModifiers]?.content counts 1
+                extra[AdditionalModifiers]?.content exists ExtraModifiers.NOINLINE
+            }
+        }
+    }
 
-//    @Test
-//    fun functionWithDefaultParameter() {
-//        inlineModelTest(
-//            """
-//                |/src/main/kotlin/function/Test.kt
-//                |package function
-//                |fun f(x: String = "") {}
-//        """
-//        ) {
-//            // TODO add default value data
-//
-//            with(this / "function" / "f" cast Function::class) {
-//                parameters.forEach { p ->
-//                    p.name equals "x"
-//                    p.type.constructorFqName.assertNotNull("Parameter type: ") equals "kotlin.String"
-//                    assert(false) { "Add default value data" }
-//                }
-//            }
-//        }
-//    }
+    @Test
+    fun annotatedFunctionWithAnnotationParameters() {
+        inlineModelTest(
+            """
+                |@Target(AnnotationTarget.VALUE_PARAMETER)
+                |@Retention(AnnotationRetention.SOURCE)
+                |@MustBeDocumented
+                |public annotation class Fancy(val size: Int)
+                |
+                |@Fancy(1) fun f() {}
+        """
+        ) {
+            with((this / "function" / "Fancy").cast<DAnnotation>()) {
+                constructors counts 1
+                with(constructors.first()) {
+                    parameters counts 1
+                    with(parameters.first()) {
+                        type.name equals "Int"
+                        name equals "size"
+                    }
+                }
+
+                with(extra[Annotations].assertNotNull("Annotations")) {
+                    content counts 3
+                    with(content.map { it.dri.classNames to it }.toMap()) {
+                        with(this["Target"].assertNotNull("Target")) {
+                            params["allowedTargets"].assertNotNull("allowedTargets") equals "[AnnotationTarget.VALUE_PARAMETER]"
+                        }
+                        with(this["Retention"].assertNotNull("Retention")) {
+                            params["value"].assertNotNull("value") equals "(kotlin/annotation/AnnotationRetention, SOURCE)"
+                        }
+                        this["MustBeDocumented"].assertNotNull("MustBeDocumented").params.entries counts 0
+                    }
+                }
+
+            }
+            with((this / "function" / "f").cast<DFunction>()) {
+                with(this.extra[Annotations].assertNotNull("Annotations")) {
+                    content counts 1
+                    with(content.first()) {
+                        dri.classNames equals "Fancy"
+                        params.entries counts 1
+                        params["size"] equals "1"
+                    }
+                }
+            }
+        }
+    }
+
+    @Test
+    fun functionWithDefaultParameter() {
+        inlineModelTest(
+            """
+                |/src/main/kotlin/function/Test.kt
+                |package function
+                |fun f(x: String = "") {}
+        """
+        ) {
+            // TODO add default value data
+
+            with((this / "function" / "f").cast<DFunction>()) {
+                parameters.forEach { p ->
+                    p.name equals "x"
+                    p.type.name.assertNotNull("Parameter type: ") equals "String"
+                    assert(false) { "No default value data" }
+                }
+            }
+        }
+    }
 
 //    @Test fun functionWithDefaultParameter() {
 //        checkSourceExistsAndVerifyModel("testdata/functions/functionWithDefaultParameter.kt", defaultModelConfig) { model ->
@@ -302,14 +348,29 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
 //            }
 //        }
 //    }
-//
-//    @Test fun sinceKotlin() {
-//        checkSourceExistsAndVerifyModel("testdata/functions/sinceKotlin.kt", defaultModelConfig) { model ->
-//            with(model.members.single().members.single()) {
-//                assertEquals("1.1", sinceKotlin)
-//            }
-//        }
-//    }
-//}
+
+    @Test
+    fun sinceKotlin() {
+        inlineModelTest(
+            """
+                |/**
+                | * Quite useful [String]
+                | */
+                |@SinceKotlin("1.1")
+                |fun f(): String = "1.1 rulezz"
+                """
+        ) {
+            with((this / "function" / "f").cast<DFunction>()) {
+                with(extra[Annotations].assertNotNull("Annotations")) {
+                    this.content counts 1
+                    with(content.first()) {
+                        dri.classNames equals "SinceKotlin"
+                        params.entries counts 1
+                        params["version"].assertNotNull("version") equals "1.1"
+                    }
+                }
+            }
+        }
+    }
 
 }
\ No newline at end of file
diff --git a/plugins/base/src/test/kotlin/model/InheritorsTest.kt b/plugins/base/src/test/kotlin/model/InheritorsTest.kt
index da128803..e1717fe4 100644
--- a/plugins/base/src/test/kotlin/model/InheritorsTest.kt
+++ b/plugins/base/src/test/kotlin/model/InheritorsTest.kt
@@ -5,8 +5,8 @@ import org.jetbrains.dokka.Platform
 import org.jetbrains.dokka.base.transformers.documentables.InheritorsExtractorTransformer
 import org.jetbrains.dokka.base.transformers.documentables.InheritorsInfo
 import org.jetbrains.dokka.model.DInterface
-import org.jetbrains.dokka.model.DPackage
 import org.jetbrains.dokka.plugability.DokkaPlugin
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import utils.AbstractModelTest
 import utils.assertNotNull
@@ -83,7 +83,7 @@ class InheritorsTest : AbstractModelTest("/src/main/kotlin/inheritors/Test.kt",
                         with(find { it.platformType == Platform.js }.assertNotNull("js key").let { map[it]!! }) {
                             this counts 2
                             val classes = listOf("B", "C")
-                            assert(all{ classes.contains(it.classNames) }){"One of subclasses missing in js"}
+                            assertTrue(all { classes.contains(it.classNames) }, "One of subclasses missing in js" )
                         }
                     }
 
diff --git a/plugins/base/src/test/kotlin/model/JavaTest.kt b/plugins/base/src/test/kotlin/model/JavaTest.kt
index c6d111a4..a3fcce42 100644
--- a/plugins/base/src/test/kotlin/model/JavaTest.kt
+++ b/plugins/base/src/test/kotlin/model/JavaTest.kt
@@ -1,8 +1,7 @@
 package model
 
+import org.jetbrains.dokka.base.transformers.documentables.InheritorsInfo
 import org.jetbrains.dokka.model.*
-import org.jetbrains.dokka.model.DEnum
-import org.jetbrains.dokka.model.DFunction
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import utils.AbstractModelTest
@@ -113,7 +112,7 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
                 val sups = listOf("Exception", "Cloneable")
                 assertTrue(
                     sups.all { s -> supertypes.map.values.flatten().any { it.classNames == s } })
-                    "Foo must extend ${sups.joinToString(", ")}"
+                "Foo must extend ${sups.joinToString(", ")}"
             }
         }
     }
@@ -155,7 +154,7 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             """
         ) {
             with((this / "java" / "Foo").cast<DClass>()) {
-                this
+                throw  AssertionError("No type parameters data for class")
             }
         }
     }
@@ -286,6 +285,24 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
     //        }
     //    }
 
+    @Test
+    fun staticMethod() {
+        inlineModelTest(
+            """
+            |class C {
+            |  public static void foo() {}
+            |}
+            """
+        ) {
+            with((this / "java" / "C" / "foo").cast<DFunction>()) {
+                with(extra[AdditionalModifiers].assertNotNull("AdditionalModifiers")) {
+                    content counts 1
+                    content.first() equals ExtraModifiers.STATIC
+                }
+            }
+        }
+    }
+
     //    @Test fun staticMethod() { todo
     //        verifyJavaPackageMember("testdata/java/staticMethod.java", defaultModelConfig) { cls ->
     //            val m = cls.members(NodeKind.Function).single { it.name == "foo" }
@@ -304,31 +321,53 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
     //            assertEquals(1, cls.members(NodeKind.Function).size)
     //        }
     //    }
-    //
-    //    @Test fun annotatedAnnotation() {
-    //        verifyJavaPackageMember("testdata/java/annotatedAnnotation.java", defaultModelConfig) { cls ->
-    //            assertEquals(1, cls.annotations.size)
-    //            with(cls.annotations[0]) {
-    //                assertEquals(1, details.count())
-    //                with(details[0]) {
-    //                    assertEquals(NodeKind.Parameter, kind)
-    //                    assertEquals(1, details.count())
-    //                    with(details[0]) {
-    //                        assertEquals(NodeKind.Value, kind)
-    //                        assertEquals("[AnnotationTarget.FIELD, AnnotationTarget.CLASS, AnnotationTarget.FILE, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER]", name)
-    //                    }
-    //                }
-    //            }
-    //        }
-    //    }
-    //
+
+    @Test
+    fun annotatedAnnotation() {
+        inlineModelTest(
+            """
+            |import java.lang.annotation.*;
+            |
+            |@Target({ElementType.FIELD, ElementType.TYPE, ElementType.METHOD})
+            |public @interface Attribute {
+            |  String value() default "";
+            |}
+            """
+        ) {
+            with((this / "java" / "Attribute").cast<DAnnotation>()) {
+                with(extra[Annotations].assertNotNull("Annotations")) {
+                    content counts 1
+                    with(content.first()) {
+                        dri.classNames equals "Target"
+                        params["value"].assertNotNull("value") equals "PsiArrayInitializerMemberValue:{ElementType.FIELD, ElementType.TYPE, ElementType.METHOD}"
+                    }
+                }
+            }
+        }
+    }
+
     //    @Test fun deprecation() {
     //        verifyJavaPackageMember("testdata/java/deprecation.java", defaultModelConfig) { cls ->
     //            val fn = cls.members(NodeKind.Function).single()
     //            assertEquals("This should no longer be used", fn.deprecation!!.content.toTestString())
     //        }
     //    }
-    //
+
+    @Test
+    fun javaLangObject() {
+        inlineModelTest(
+            """
+            |class Test {
+            |  public Object fn() { return null; }
+            |}
+            """
+        ) {
+            with((this / "java" / "Test" / "fn").cast<DFunction>()) {
+                type.name equals "Any"
+            }
+        }
+    }
+
     //    @Test fun javaLangObject() {
     //        verifyJavaPackageMember("testdata/java/javaLangObject.java", defaultModelConfig) { cls ->
     //            val fn = cls.members(NodeKind.Function).single()
@@ -356,6 +395,30 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
         }
     }
 
+    @Test
+    fun inheritorLinks() {
+        inlineModelTest(
+            """
+            |public class InheritorLinks {
+            |  public static class Foo {}
+            |
+            |  public static class Bar extends Foo {}
+            |}
+            """
+        ) {
+            with((this / "java" / "InheritorLinks").cast<DClass>()) {
+                val dri = (this / "Foo").assertNotNull("Foo dri").dri
+                with((this / "Bar").cast<DClass>()) {
+                    with(extra[InheritorsInfo].assertNotNull("InheritorsInfo")) {
+                        with(value.map.values.flatten().distinct()) {
+                            this counts 1
+                            first() equals dri
+                        }
+                    }
+                }
+            }
+        }
+    }
 
     //    todo
     //    @Test fun inheritorLinks() {
diff --git a/plugins/base/src/test/kotlin/model/PropertyTest.kt b/plugins/base/src/test/kotlin/model/PropertyTest.kt
index f391df4e..f6f7f3c0 100644
--- a/plugins/base/src/test/kotlin/model/PropertyTest.kt
+++ b/plugins/base/src/test/kotlin/model/PropertyTest.kt
@@ -1,8 +1,6 @@
 package model
 
-import org.jetbrains.dokka.model.KotlinVisibility
-import org.jetbrains.dokka.model.DPackage
-import org.jetbrains.dokka.model.DProperty
+import org.jetbrains.dokka.model.*
 import org.junit.jupiter.api.Test
 import utils.AbstractModelTest
 import utils.assertNotNull
@@ -140,19 +138,48 @@ class PropertyTest : AbstractModelTest("/src/main/kotlin/property/Test.kt", "pro
         }
     }
 
-    // todo
-//    @Test fun sinceKotlin() {
-//        checkSourceExistsAndVerifyModel("testdata/properties/sinceKotlin.kt", defaultModelConfig) { model ->
-//            with(model.members.single().members.single()) {
-//                assertEquals("1.1", sinceKotlin)
-//            }
-//        }
-//    }
-//}
-//
-//class JSPropertyTest: BasePropertyTest(Platform.js) {}
-//
-//class JVMPropertyTest : BasePropertyTest(Platform.jvm) {
+    @Test
+    fun sinceKotlin() {
+        inlineModelTest(
+            """
+                |/**
+                | * Quite useful [String]
+                | */
+                |@SinceKotlin("1.1")
+                |val prop: String = "1.1 rulezz"
+                """
+        ) {
+            with((this / "property" / "prop").cast<DProperty>()) {
+                with(extra[Annotations].assertNotNull("Annotations")) {
+                    this.content counts 1
+                    with(content.first()) {
+                        dri.classNames equals "SinceKotlin"
+                        params.entries counts 1
+                        params["version"].assertNotNull("version") equals "1.1"
+                    }
+                }
+            }
+        }
+    }
+
+    @Test
+    fun annotatedProperty() {
+        inlineModelTest(
+            """
+                |@Strictfp var property = "test"
+                """
+        ) {
+            with((this / "property" / "property").cast<DProperty>()) {
+                with(extra[Annotations].assertNotNull("Annotations")) {
+                    this.content counts 1
+                    with(content.first()) {
+                        dri.classNames equals "Strictfp"
+                        params.entries counts 0
+                    }
+                }
+            }
+        }
+    }
 //    @Test
 //    fun annotatedProperty() {
 //        checkSourceExistsAndVerifyModel(
diff --git a/plugins/base/src/test/kotlin/pageMerger/PageNodeMergerTest.kt b/plugins/base/src/test/kotlin/pageMerger/PageNodeMergerTest.kt
index 15dc5581..6ef38aa9 100644
--- a/plugins/base/src/test/kotlin/pageMerger/PageNodeMergerTest.kt
+++ b/plugins/base/src/test/kotlin/pageMerger/PageNodeMergerTest.kt
@@ -110,13 +110,13 @@ class PageNodeMergerTest : AbstractCoreTest() {
                 val testT = allChildren.filter { it.name == "testT" }
                 val test = allChildren.filter { it.name == "test" }
 
-                assert(testT.size == 1) { "There can be only one testT page" }
-                assert(testT.first().dri.size == 1) { "testT page should have single DRI, but has ${testT.first().dri.size}" }
+                assertTrue(testT.size == 1) { "There can be only one testT page" }
+                assertTrue(testT.first().dri.size == 1) { "testT page should have single DRI, but has ${testT.first().dri.size}" }
 
-                assert(test.size == 1) { "There can be only one test page" }
-                assert(test.first().dri.size == 1) { "test page should have single DRI, but has ${test.first().dri.size}" }
+                assertTrue(test.size == 1) { "There can be only one test page" }
+                assertTrue(test.first().dri.size == 1) { "test page should have single DRI, but has ${test.first().dri.size}" }
 
-                assert(strList.count() == 2) { "Expected 2 warnings, got ${strList.count()}" }
+                assertTrue(strList.count() == 2) { "Expected 2 warnings, got ${strList.count()}" }
             }
         }
     }
diff --git a/plugins/base/src/test/kotlin/utils/TestUtils.kt b/plugins/base/src/test/kotlin/utils/TestUtils.kt
index 68ab7120..8a3053b3 100644
--- a/plugins/base/src/test/kotlin/utils/TestUtils.kt
+++ b/plugins/base/src/test/kotlin/utils/TestUtils.kt
@@ -3,6 +3,7 @@ package utils
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.doc.*
 import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest
+import org.junit.jupiter.api.Assertions.assertTrue
 import kotlin.collections.orEmpty
 
 @DslMarker
@@ -22,6 +23,10 @@ interface AssertDSL {
     infix fun Any?.equals(other: Any?) = this.assertEqual(other)
     infix fun Collection<Any>?.allEquals(other: Any?) =
         this?.also { c -> c.forEach { it equals other } } ?: run { assert(false) { "Collection is empty" } }
+    infix fun <T> Collection<T>?.exists(e: T) {
+        assertTrue(this.orEmpty().isNotEmpty(), "Collection cannot be null or empty")
+        assertTrue(this!!.any{it == e}, "Collection doesn't contain $e")
+    }
 
     infix fun <T> Collection<T>?.counts(n: Int) = this.orEmpty().assertCount(n)
 
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index 991ee07d..ce41562b 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -259,7 +259,7 @@ internal fun ClassId.toDRI(dri: DRI?): DRI = DRI(
 )
 
 private fun PropertyContainer<out Documentable>.mergeAdditionalModifiers(second: Set<ExtraModifiers>) =
-    this[AdditionalModifiers.AdditionalKey]?.squash(AdditionalModifiers(second)) ?: AdditionalModifiers(second)
+    this[AdditionalModifiers]?.squash(AdditionalModifiers(second)) ?: AdditionalModifiers(second)
 
 private fun AdditionalModifiers.squash(second: AdditionalModifiers) =
     AdditionalModifiers(content + second.content)
-- 
cgit 


From fc30a08beb509a03112298a6dd52c5001a2c6a53 Mon Sep 17 00:00:00 2001
From: Paweł Marks <pmarks@virtuslab.com>
Date: Fri, 20 Mar 2020 12:19:47 +0100
Subject: Add missing flatmap and remove unnecessary cast making tests fail

---
 .../src/main/kotlin/converters/KotlinToJavaConverter.kt               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index ce41562b..6de3f121 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -33,9 +33,9 @@ internal fun DPackage.asJava(): DPackage {
                 constructors = emptyList(),
                 functions = (
                         nodes.filterIsInstance<DProperty>()
-                            .map { it.javaAccessors() } +
+                            .flatMap { it.javaAccessors() } +
                                 nodes.filterIsInstance<DFunction>()
-                                    .map { it.asJava(syntheticClassName) }) as List<DFunction>, // TODO: methods are static and receiver is a param
+                                    .map { it.asJava(syntheticClassName) }), // TODO: methods are static and receiver is a param
                 classlikes = emptyList(),
                 sources = PlatformDependent.empty(),
                 visibility = PlatformDependent(
-- 
cgit 


From 8a87b5e0bd2eda12f4e44512e3f8856c72e53b3e Mon Sep 17 00:00:00 2001
From: Filip Zybała <fzybala@virtuslab.com>
Date: Fri, 20 Mar 2020 15:27:30 +0100
Subject: Changed modifier to PlatformDependent

---
 core/src/main/kotlin/model/Documentable.kt         |  8 ++++----
 .../kotlin/signatures/KotlinSignatureProvider.kt   |  9 ++++-----
 .../DefaultDescriptorToDocumentableTranslator.kt   | 15 +++++++++-----
 .../documentables/DefaultPageCreator.kt            |  1 +
 .../psi/DefaultPsiToDocumentableTranslator.kt      |  7 ++++---
 .../kotlin/converters/KotlinToJavaConverter.kt     | 23 ++++++++++++----------
 .../kotlin/signatures/JavaSignatureProvider.kt     |  4 ++--
 7 files changed, 38 insertions(+), 29 deletions(-)

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/core/src/main/kotlin/model/Documentable.kt b/core/src/main/kotlin/model/Documentable.kt
index 6215be18..00a26d90 100644
--- a/core/src/main/kotlin/model/Documentable.kt
+++ b/core/src/main/kotlin/model/Documentable.kt
@@ -63,7 +63,7 @@ interface WithType {
 }
 
 interface WithAbstraction {
-    val modifier: Modifier
+    val modifier: PlatformDependent<Modifier>
 }
 
 sealed class Modifier(val name: String)
@@ -146,7 +146,7 @@ data class DClass(
     override val generics: List<DTypeParameter>,
     override val supertypes: PlatformDependent<List<DRI>>,
     override val documentation: PlatformDependent<DocumentationNode>,
-    override val modifier: Modifier,
+    override val modifier: PlatformDependent<Modifier>,
     override val platformData: List<PlatformData>,
     override val extra: PropertyContainer<DClass> = PropertyContainer.empty()
 ) : DClasslike(), WithAbstraction, WithCompanion, WithConstructors, WithGenerics, WithSupertypes,
@@ -207,7 +207,7 @@ data class DFunction(
     override val type: Bound,
     override val generics: List<DTypeParameter>,
     override val receiver: DParameter?,
-    override val modifier: Modifier,
+    override val modifier: PlatformDependent<Modifier>,
     override val platformData: List<PlatformData>,
     override val extra: PropertyContainer<DFunction> = PropertyContainer.empty()
 ) : Documentable(), Callable, WithGenerics, WithExtraProperties<DFunction> {
@@ -287,7 +287,7 @@ data class DProperty(
     override val receiver: DParameter?,
     val setter: DFunction?,
     val getter: DFunction?,
-    override val modifier: Modifier,
+    override val modifier: PlatformDependent<Modifier>,
     override val platformData: List<PlatformData>,
     override val extra: PropertyContainer<DProperty> = PropertyContainer.empty()
 ) : Documentable(), Callable, WithExtraProperties<DProperty> {
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
index c40c5b7c..d87152d5 100644
--- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
+++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
@@ -34,10 +34,9 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
     private fun signature(c: DClasslike) = contentBuilder.contentFor(c, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
         platformText(c.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
         if (c is DClass) {
-            if (c.extra[AdditionalModifiers]?.content?.contains(ExtraModifiers.DATA) == true) {
-                text("data ")
-            } else {
-                text(c.modifier.name + " ")
+            platformText(c.modifier){
+                if (c.extra[AdditionalModifiers]?.content?.contains(ExtraModifiers.DATA) == true && it.name == "final") "data "
+                else it.name + " "
             }
         }
         when (c) {
@@ -72,7 +71,7 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
 
     private fun signature(f: DFunction) = contentBuilder.contentFor(f, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
         platformText(f.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
-        text(f.modifier.name + " ")
+        platformText(f.modifier) { it.name }
         text("fun ")
         list(f.generics, prefix = "<", suffix = "> ") {
             +buildSignature(it)
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index ccee7269..bed6c25c 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -233,7 +233,8 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
                 else PlatformDependent.from(platformData,info.supertypes),
             generics = descriptor.typeConstructor.parameters.map { it.toTypeParameter() },
             documentation = info.docs,
-            modifier = descriptor.modifier(),
+            modifier = if(isExpect) PlatformDependent.expectFrom(descriptor.modifier())
+                    else PlatformDependent.from(platformData, descriptor.modifier()),
             companion = descriptor.companion(driWithPlatform),
             platformData = listOf(platformData),
             extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
@@ -261,7 +262,8 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
             visibility = if(isExpect) PlatformDependent.expectFrom(descriptor.visibility.toDokkaVisibility())
                 else PlatformDependent.from(platformData,descriptor.visibility.toDokkaVisibility()),
             documentation = descriptor.resolveDescriptorData(if (!isExpect) platformData else null),
-            modifier = descriptor.modifier(),
+            modifier = if(isExpect) PlatformDependent.expectFrom(descriptor.modifier())
+            else PlatformDependent.from(platformData, descriptor.modifier()),
             type = descriptor.returnType!!.toBound(),
             platformData = listOf(platformData),
             extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
@@ -288,7 +290,8 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
                 else PlatformDependent.from(platformData,descriptor.visibility.toDokkaVisibility()),
             generics = descriptor.typeParameters.map { it.toTypeParameter() },
             documentation = descriptor.resolveDescriptorData(if (!isExpect) platformData else null),
-            modifier = descriptor.modifier(),
+            modifier = if(isExpect) PlatformDependent.expectFrom(descriptor.modifier())
+            else PlatformDependent.from(platformData, descriptor.modifier()),
             type = descriptor.returnType!!.toBound(),
             platformData = listOf(platformData),
             extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
@@ -315,7 +318,8 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
                 else PlatformDependent.from(platformData,descriptor.visibility.toDokkaVisibility()),
             documentation = descriptor.resolveDescriptorData(if (!isExpect) platformData else null),
             type = descriptor.returnType.toBound(),
-            modifier = descriptor.modifier(),
+            modifier = if(isExpect) PlatformDependent.expectFrom(descriptor.modifier())
+            else PlatformDependent.from(platformData, descriptor.modifier()),
             generics = descriptor.typeParameters.map { it.toTypeParameter() },
             platformData = listOf(platformData),
             extra = PropertyContainer.withAll<DFunction>(descriptor.additionalExtras(), descriptor.getAnnotations()).let {
@@ -377,7 +381,8 @@ private class DokkaDescriptorVisitor( // TODO: close this class and make it priv
             documentation = descriptor.resolveDescriptorData(if (!isExpect) platformData else null),
             type = descriptor.returnType!!.toBound(),
             generics = descriptor.typeParameters.map { it.toTypeParameter() },
-            modifier = descriptor.modifier(),
+            modifier = if(isExpect) PlatformDependent.expectFrom(descriptor.modifier())
+            else PlatformDependent.from(platformData, descriptor.modifier()),
             receiver = descriptor.extensionReceiverParameter?.let {
                 visitReceiverParameterDescriptor(
                     it,
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index 3f3ebe3a..b9e02398 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -166,6 +166,7 @@ open class DefaultPageCreator(
     protected open fun contentForFunction(f: DFunction) = contentBuilder.contentFor(f) {
         header(1) { text(f.name) }
         platformDependentHint(f.dri, f.platformData.toSet()){
+            if(f.sources.expect != null) text("actual")
             +buildSignature(f)
             +contentForComments(f)
         }
diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
index 218f8c82..ee862fb8 100644
--- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
@@ -122,6 +122,7 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
             val classlikes = innerClasses.map { parseClasslike(it, dri) }
             val visibility = getVisibility().toPlatformDependant()
             val ancestors = ancestorsSet.toList().toPlatformDependant()
+            val modifiers = getModifier().toPlatformDependant()
             return when {
                 isAnnotationType ->
                     DAnnotation(
@@ -193,7 +194,7 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
                     mapTypeParameters(dri),
                     ancestors,
                     documentation,
-                    getModifier(),
+                    modifiers,
                     listOf(platformData),
                     PropertyContainer.empty<DClass>() + annotations.toList().toExtra()
                 )
@@ -226,7 +227,7 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
                 psi.returnType?.let { getBound(type = it) } ?: Void,
                 psi.mapTypeParameters(dri),
                 null,
-                psi.getModifier(),
+                psi.getModifier().toPlatformDependant(),
                 listOf(platformData),
                 PropertyContainer.withAll(
                     InheritedFunction(isInherited),
@@ -339,7 +340,7 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
                 null,
                 accessors.firstOrNull { it.hasParameters() }?.let { parseFunction(it, parent) },
                 accessors.firstOrNull { it.returnType == psi.type }?.let { parseFunction(it, parent) },
-                psi.getModifier(),
+                psi.getModifier().toPlatformDependant(),
                 listOf(platformData),
                 PropertyContainer.empty<DProperty>() + psi.annotations.toList().toExtra()
             )
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index 6de3f121..dac937c0 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -47,7 +47,7 @@ internal fun DPackage.asJava(): DPackage {
                 generics = emptyList(),
                 supertypes = PlatformDependent.empty(),
                 documentation = PlatformDependent.empty(),
-                modifier = JavaModifier.Final,
+                modifier = PlatformDependent(map = platformData.map{ it to JavaModifier.Final}.toMap()),
                 platformData = platformData,
                 extra = PropertyContainer.empty()
             )
@@ -68,9 +68,9 @@ internal fun DProperty.asJava(isTopLevel: Boolean = false, relocateToClass: Stri
             dri.withClass(relocateToClass)
         },
         modifier = if (setter == null) {
-            JavaModifier.Final
+            PlatformDependent(map = platformData.map{it to JavaModifier.Final}.toMap())
         } else {
-            JavaModifier.Empty
+            PlatformDependent(map = platformData.map{it to JavaModifier.Empty}.toMap())
         },
         visibility = visibility.copy(
             map = visibility.mapValues { JavaVisibility.Private }
@@ -91,9 +91,9 @@ internal fun DProperty.javaAccessors(isTopLevel: Boolean = false, relocateToClas
             },
             name = "get" + name.capitalize(),
             modifier = if (setter == null) {
-                JavaModifier.Final
+                PlatformDependent(map = platformData.map{it to JavaModifier.Final}.toMap())
             } else {
-                JavaModifier.Empty
+                PlatformDependent(map = platformData.map{it to JavaModifier.Empty}.toMap())
             },
             visibility = visibility.copy(
                 map = visibility.mapValues { JavaVisibility.Public }
@@ -109,9 +109,9 @@ internal fun DProperty.javaAccessors(isTopLevel: Boolean = false, relocateToClas
             },
             name = "set" + name.capitalize(),
             modifier = if (setter == null) {
-                JavaModifier.Final
+                PlatformDependent(map = platformData.map{it to JavaModifier.Final}.toMap())
             } else {
-                JavaModifier.Empty
+                PlatformDependent(map = platformData.map{it to JavaModifier.Empty}.toMap())
             },
             visibility = visibility.copy(
                 map = visibility.mapValues { JavaVisibility.Public }
@@ -131,7 +131,9 @@ internal fun DFunction.asJava(containingClassName: String): DFunction {
 //        dri = dri.copy(callable = dri.callable?.asJava()),
         name = newName,
         type = type.asJava(),
-        modifier = if(modifier is KotlinModifier.Final && isConstructor) JavaModifier.Empty else modifier,
+        modifier = if(modifier.all{(_,v)-> v is KotlinModifier.Final} && isConstructor)
+            PlatformDependent(map = platformData.map{it to JavaModifier.Empty}.toMap())
+        else PlatformDependent(map = platformData.map{it to modifier.allValues.first()}.toMap()),
         parameters = listOfNotNull(receiver?.asJava()) + parameters.map { it.asJava() },
         receiver = null
     ) // TODO static if toplevel
@@ -157,7 +159,8 @@ internal fun DClass.asJava(): DClass = copy(
     supertypes = supertypes.copy(
         map = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
     ),
-    modifier = if (modifier is KotlinModifier.Empty) JavaModifier.Final else modifier
+    modifier = if (modifier.all{(_,v) -> v is KotlinModifier.Empty}) PlatformDependent(map = platformData.map{it to JavaModifier.Final}.toMap())
+    else PlatformDependent(map = platformData.map{it to modifier.allValues.first()}.toMap())
 )
 
 private fun DTypeParameter.asJava(): DTypeParameter = copy(
@@ -195,7 +198,7 @@ internal fun DObject.asJava(): DObject = copy(
     properties = properties.map { it.asJava() } +
             DProperty(
                 name = "INSTANCE",
-                modifier = JavaModifier.Final,
+                modifier = PlatformDependent(map = platformData.map{it to JavaModifier.Final}.toMap()),
                 dri = dri.copy(callable = Callable("INSTANCE", null, emptyList())),
                 documentation = PlatformDependent.empty(),
                 sources = PlatformDependent.empty(),
diff --git a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
index 6a571660..54bf663d 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
@@ -33,7 +33,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
         platformText(c.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
 
         if (c is DClass) {
-            text(c.modifier.takeIf { it !in ignoredModifiers }?.name.orEmpty() + " ")
+            platformText(c.modifier){ it.takeIf{it !in ignoredModifiers}?.name.orEmpty() + " "}
         }
 
         when (c) {
@@ -63,7 +63,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
     }
 
     private fun signature(f: DFunction) = contentBuilder.contentFor(f, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
-        text(f.modifier.takeIf { it !in ignoredModifiers }?.name.orEmpty() + " ")
+        platformText(f.modifier){ it.takeIf{it !in ignoredModifiers}?.name.orEmpty() + " "}
         val returnType = f.type
         signatureForProjection(returnType)
         text("  ")
-- 
cgit 


From 17ef3207c536a9bd5357336977a0c59efcc8daba Mon Sep 17 00:00:00 2001
From: Marcin Aman <maman@virtuslab.com>
Date: Tue, 5 May 2020 12:09:39 +0200
Subject: Receiver for extension property #809

---
 core/src/main/kotlin/model/Documentable.kt         |  3 +-
 .../kotlin/signatures/KotlinSignatureProvider.kt   | 12 +++++
 .../documentables/DefaultDocumentableMerger.kt     |  3 +-
 .../documentables/DocumentableVisibilityFilter.kt  |  1 +
 .../DefaultDescriptorToDocumentableTranslator.kt   |  1 +
 .../psi/DefaultPsiToDocumentableTranslator.kt      |  1 +
 plugins/base/src/test/kotlin/model/PropertyTest.kt | 53 ++++++++++++++++++++++
 .../out/html/root/[jvm root]/-fancy/index.html     |  2 +-
 .../kotlin/converters/KotlinToJavaConverter.kt     |  1 +
 9 files changed, 74 insertions(+), 3 deletions(-)

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/core/src/main/kotlin/model/Documentable.kt b/core/src/main/kotlin/model/Documentable.kt
index 38b9ee71..313f4cd4 100644
--- a/core/src/main/kotlin/model/Documentable.kt
+++ b/core/src/main/kotlin/model/Documentable.kt
@@ -308,8 +308,9 @@ data class DProperty(
     val getter: DFunction?,
     override val modifier: PlatformDependent<Modifier>,
     override val platformData: List<PlatformData>,
+    override val generics: List<DTypeParameter>,
     override val extra: PropertyContainer<DProperty> = PropertyContainer.empty()
-) : Documentable(), Callable, WithExtraProperties<DProperty> {
+) : Documentable(), Callable, WithExtraProperties<DProperty>, WithGenerics {
     override val children: List<Nothing>
         get() = emptyList()
 
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
index 7b35c455..30ec38bb 100644
--- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
+++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
@@ -89,6 +89,18 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
 
     private fun propertySignature(p: DProperty, platformData: Set<PlatformData> = p.platformData.toSet()) =
         contentBuilder.contentFor(p, ContentKind.Symbol, setOf(TextStyle.Monospace), platformData = platformData) {
+            platformText(p.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
+            platformText(p.modifier){ it.name + " "}
+            p.setter?.let { text("var ") } ?: text("val ")
+            list(p.generics, prefix = "<", suffix = "> ") {
+                +buildSignature(it)
+            }
+            p.receiver?.also {
+                signatureForProjection(it.type)
+                text(".")
+            }
+            link(p.name, p.dri)
+            text(": ")
             signatureForProjection(p.type)
         }
 
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
index 4daa4a50..f871cdec 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
@@ -132,7 +132,8 @@ fun DProperty.mergeWith(other: DProperty): DProperty = copy(
     modifier = modifier.mergeWith(other.modifier),
     platformData = (platformData + other.platformData).distinct(),
     getter = getter?.let { g -> other.getter?.let { g.mergeWith(it) } ?: g } ?: other.getter,
-    setter = setter?.let { s -> other.setter?.let { s.mergeWith(it) } ?: s } ?: other.setter
+    setter = setter?.let { s -> other.setter?.let { s.mergeWith(it) } ?: s } ?: other.setter,
+    generics = merge(generics + other.generics, DTypeParameter::mergeWith)
 ).mergeExtras(this, other)
 
 fun DClasslike.setPlatformData(platformData: List<PlatformData>): DClasslike = when (this) {
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt b/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt
index 36441426..c261d2dc 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt
@@ -163,6 +163,7 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
                         getter,
                         modifier,
                         filteredPlatforms,
+                        generics.mapNotNull { it.filter(filteredPlatforms) },
                         extra
                     )
                 }
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index 757a84e1..be18c592 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -275,6 +275,7 @@ private class DokkaDescriptorVisitor(
             else PlatformDependent.from(platformData, descriptor.modifier()),
             type = descriptor.returnType!!.toBound(),
             platformData = listOf(platformData),
+            generics = descriptor.typeParameters.map { it.toTypeParameter() },
             extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
         )
     }
diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
index c0e1b4af..e5fa4bfc 100644
--- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
@@ -357,6 +357,7 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                 accessors.firstOrNull { it.returnType == psi.type }?.let { parseFunction(it) },
                 psi.getModifier().toPlatformDependant(),
                 listOf(platformData),
+                emptyList(),
                 PropertyContainer.empty<DProperty>() + psi.annotations.toList().toExtra()
             )
         }
diff --git a/plugins/base/src/test/kotlin/model/PropertyTest.kt b/plugins/base/src/test/kotlin/model/PropertyTest.kt
index 14f7b402..ac055c69 100644
--- a/plugins/base/src/test/kotlin/model/PropertyTest.kt
+++ b/plugins/base/src/test/kotlin/model/PropertyTest.kt
@@ -188,6 +188,59 @@ class PropertyTest : AbstractModelTest("/src/main/kotlin/property/Test.kt", "pro
             }
         }
     }
+
+    @Test fun genericTopLevelExtensionProperty(){
+        inlineModelTest(
+            """ | val <T : Number> List<T>.sampleProperty: T
+                |   get() { TODO() }
+            """.trimIndent()
+        ){
+            with((this / "property" / "sampleProperty").cast<DProperty>()) {
+                name equals "sampleProperty"
+                with(receiver.assertNotNull("Property receiver")) {
+                    type.name equals "List"
+                }
+                with(getter.assertNotNull("Getter")) {
+                    type.name equals "T"
+                }
+                setter equals null
+                generics counts 1
+                generics.forEach {
+                    it.name equals "T"
+                    it.bounds.first().name equals "Number"
+                }
+                visibility.values allEquals KotlinVisibility.Public
+            }
+        }
+    }
+
+    @Test fun genericExtensionPropertyInClass(){
+        inlineModelTest(
+            """ | package test
+                | class XD<T> {
+                |   var List<T>.sampleProperty: T
+                |       get() { TODO() }
+                |       set(value) { TODO() }
+                | }
+            """.trimIndent()
+        ){
+            with((this / "property" / "XD" / "sampleProperty").cast<DProperty>()) {
+                name equals "sampleProperty"
+                children counts 0
+                with(receiver.assertNotNull("Property receiver")) {
+                    type.name equals "List"
+                }
+                with(getter.assertNotNull("Getter")) {
+                    type.name equals "T"
+                }
+                with(setter.assertNotNull("Setter")){
+                    type.name equals "Unit"
+                }
+                generics counts 0
+                visibility.values allEquals KotlinVisibility.Public
+            }
+        }
+    }
 //    @Test
 //    fun annotatedProperty() {
 //        checkSourceExistsAndVerifyModel(
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html
index 1a32310b..de6b4b3b 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html	
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html	
@@ -67,7 +67,7 @@
               <tr class="platform-tagged">
                 <td class="content"><a href="">size</a></td>
                 <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace"><a href="">Int</a></div></div></div>
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final val <a href="">size</a>: <a href="">Int</a></div></div></div>
                   <div class="brief "> </div>
                 </td>
                 <td class="platform-tagged">
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index dac937c0..0befe077 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -212,6 +212,7 @@ internal fun DObject.asJava(): DObject = copy(
                 getter = null,
                 platformData = platformData,
                 receiver = null,
+                generics = emptyList(),
                 extra = PropertyContainer.empty<DProperty>() + AdditionalModifiers(setOf(ExtraModifiers.STATIC))
             ),
     classlikes = classlikes.map { it.asJava() },
-- 
cgit 


From 3f2a790190da4f40ea6d8a976aa1929b2a1b002b Mon Sep 17 00:00:00 2001
From: Błażej Kardyś <bkardys@virtuslab.com>
Date: Tue, 5 May 2020 17:45:12 +0200
Subject: Changing approach from platform-driven to source-set-driven

---
 .idea/compiler.xml                                 |  36 +++
 core/src/main/kotlin/DokkaGenerator.kt             |  36 +--
 core/src/main/kotlin/configuration.kt              |   6 +-
 core/src/main/kotlin/defaultConfiguration.kt       |   2 +
 core/src/main/kotlin/model/Documentable.kt         | 168 ++++++--------
 core/src/main/kotlin/model/SourceSetData.kt        |  23 ++
 core/src/main/kotlin/model/aditionalExtras.kt      |   4 +-
 core/src/main/kotlin/model/documentableUtils.kt    |  15 +-
 core/src/main/kotlin/pages/ContentNodes.kt         |  29 +--
 core/src/main/kotlin/pages/PageNodes.kt            |   5 +-
 core/src/main/kotlin/plugability/DokkaContext.kt   |  14 +-
 .../PreMergeDocumentableTransformer.kt             |   2 +-
 .../sources/SourceToDocumentableTranslator.kt      |   4 +-
 plugins/base/src/main/kotlin/DokkaBase.kt          |   6 +-
 .../src/main/kotlin/renderers/DefaultRenderer.kt   |  21 +-
 .../src/main/kotlin/renderers/html/HtmlRenderer.kt |  58 ++---
 .../main/kotlin/renderers/html/NavigationPage.kt   |   4 +-
 .../resolvers/local/DefaultLocationProvider.kt     |   9 +-
 .../kotlin/resolvers/local/LocationProvider.kt     |   4 +-
 .../kotlin/signatures/KotlinSignatureProvider.kt   |  35 ++-
 .../documentables/ActualTypealiasAdder.kt          |   8 +-
 .../documentables/DefaultDocumentableMerger.kt     | 233 ++++++++-----------
 .../documentables/DocumentableVisibilityFilter.kt  |  55 +++--
 .../InheritorsExtractorTransformer.kt              |  23 +-
 .../ModuleAndPackageDocumentationTransformer.kt    |  42 ++--
 .../pages/comments/CommentsToContentConverter.kt   |   3 +-
 .../pages/comments/DocTagToContentConverter.kt     |  33 +--
 .../merger/SameMethodNamePageMergerStrategy.kt     |   2 +-
 .../pages/samples/SamplesTransformer.kt            |  25 +-
 .../pages/sourcelinks/SourceLinksTransformer.kt    |  23 +-
 .../DefaultDescriptorToDocumentableTranslator.kt   | 252 ++++++++++-----------
 .../documentables/DefaultPageCreator.kt            | 111 +++++----
 .../documentables/PageContentBuilder.kt            |  98 ++++----
 .../psi/DefaultPsiToDocumentableTranslator.kt      |  57 +++--
 .../src/test/kotlin/expect/AbstractExpectTest.kt   |   2 +-
 .../kotlin/linkableContent/LinkableContentTest.kt  |   6 +
 plugins/base/src/test/kotlin/model/ClassesTest.kt  |  20 +-
 .../base/src/test/kotlin/model/InheritorsTest.kt   |  10 +-
 plugins/base/src/test/kotlin/model/JavaTest.kt     |   4 +-
 plugins/base/src/test/kotlin/model/PackagesTest.kt |   4 +-
 .../test/kotlin/renderers/RenderingOnlyTestBase.kt |   7 +-
 .../renderers/html/PlatformDependentHintTest.kt    | 120 ----------
 .../renderers/html/SourceSetDependentHintTest.kt   | 121 ++++++++++
 .../annotatedFunction/out/html/navigation.html     |   6 +-
 .../out/html/root/[jvm root]/f.html                |  32 ---
 .../out/html/root/[jvm root]/index.html            |  50 ----
 .../out/html/root/[main root]/f.html               |  32 +++
 .../out/html/root/[main root]/index.html           |  50 ++++
 .../annotatedFunction/out/html/root/index.html     |   4 +-
 .../annotatedFunction/out/html/root/package-list   |   4 +-
 .../annotatedFunction/out/html/scripts/pages.js    |   0
 .../out/html/navigation.html                       |  10 +-
 .../out/html/root/[jvm root]/-fancy/-init-.html    |  32 ---
 .../out/html/root/[jvm root]/-fancy/equals.html    |  32 ---
 .../out/html/root/[jvm root]/-fancy/hash-code.html |  32 ---
 .../out/html/root/[jvm root]/-fancy/index.html     | 102 ---------
 .../out/html/root/[jvm root]/-fancy/to-string.html |  32 ---
 .../out/html/root/[jvm root]/f.html                |  32 ---
 .../out/html/root/[jvm root]/index.html            |  69 ------
 .../out/html/root/[main root]/-fancy/-init-.html   |  32 +++
 .../out/html/root/[main root]/-fancy/equals.html   |  32 +++
 .../html/root/[main root]/-fancy/hash-code.html    |  32 +++
 .../out/html/root/[main root]/-fancy/index.html    | 102 +++++++++
 .../html/root/[main root]/-fancy/to-string.html    |  32 +++
 .../out/html/root/[main root]/f.html               |  32 +++
 .../out/html/root/[main root]/index.html           |  69 ++++++
 .../out/html/root/index.html                       |   4 +-
 .../out/html/root/package-list                     |  10 +-
 .../expect/function/out/html/navigation.html       |   6 +-
 .../function/out/html/root/[jvm root]/fn.html      |  34 ---
 .../function/out/html/root/[jvm root]/index.html   |  50 ----
 .../function/out/html/root/[main root]/fn.html     |  34 +++
 .../function/out/html/root/[main root]/index.html  |  50 ++++
 .../expect/function/out/html/root/index.html       |   4 +-
 .../expect/function/out/html/root/package-list     |   4 +-
 .../out/html/navigation.html                       |  10 +-
 .../out/html/root/[jvm root]/-fancy/-init-.html    |  32 ---
 .../out/html/root/[jvm root]/-fancy/equals.html    |  32 ---
 .../out/html/root/[jvm root]/-fancy/hash-code.html |  32 ---
 .../out/html/root/[jvm root]/-fancy/index.html     |  83 -------
 .../out/html/root/[jvm root]/-fancy/to-string.html |  32 ---
 .../out/html/root/[jvm root]/function.html         |  32 ---
 .../out/html/root/[jvm root]/index.html            |  69 ------
 .../out/html/root/[main root]/-fancy/-init-.html   |  32 +++
 .../out/html/root/[main root]/-fancy/equals.html   |  32 +++
 .../html/root/[main root]/-fancy/hash-code.html    |  32 +++
 .../out/html/root/[main root]/-fancy/index.html    |  83 +++++++
 .../html/root/[main root]/-fancy/to-string.html    |  32 +++
 .../out/html/root/[main root]/function.html        |  32 +++
 .../out/html/root/[main root]/index.html           |  69 ++++++
 .../out/html/root/index.html                       |   4 +-
 .../out/html/root/package-list                     |  10 +-
 .../out/html/navigation.html                       |   6 +-
 .../out/html/root/[jvm root]/f.html                |  32 ---
 .../out/html/root/[jvm root]/index.html            |  50 ----
 .../out/html/root/[main root]/f.html               |  32 +++
 .../out/html/root/[main root]/index.html           |  50 ++++
 .../out/html/root/index.html                       |   4 +-
 .../out/html/root/package-list                     |   4 +-
 .../out/html/navigation.html                       |   6 +-
 .../out/html/root/[jvm root]/function.html         |  32 ---
 .../out/html/root/[jvm root]/index.html            |  50 ----
 .../out/html/root/[main root]/function.html        |  32 +++
 .../out/html/root/[main root]/index.html           |  50 ++++
 .../out/html/root/index.html                       |   4 +-
 .../out/html/root/package-list                     |   4 +-
 .../out/html/navigation.html                       |   6 +-
 .../out/html/root/[jvm root]/f.html                |  32 ---
 .../out/html/root/[jvm root]/index.html            |  50 ----
 .../out/html/root/[main root]/f.html               |  32 +++
 .../out/html/root/[main root]/index.html           |  50 ++++
 .../out/html/root/index.html                       |   4 +-
 .../out/html/root/package-list                     |   4 +-
 .../functionWithParams/out/html/navigation.html    |   6 +-
 .../out/html/root/[jvm root]/function.html         |  34 ---
 .../out/html/root/[jvm root]/index.html            |  50 ----
 .../out/html/root/[main root]/function.html        |  34 +++
 .../out/html/root/[main root]/index.html           |  50 ++++
 .../functionWithParams/out/html/root/index.html    |   4 +-
 .../functionWithParams/out/html/root/package-list  |   4 +-
 .../functionWithReceiver/out/html/navigation.html  |   6 +-
 .../out/html/root/[jvm root]/fn.html               |  40 ----
 .../out/html/root/[jvm root]/index.html            |  66 ------
 .../out/html/root/[main root]/fn.html              |  40 ++++
 .../out/html/root/[main root]/index.html           |  66 ++++++
 .../functionWithReceiver/out/html/root/index.html  |   4 +-
 .../out/html/root/package-list                     |   6 +-
 .../genericFunction/out/html/navigation.html       |   6 +-
 .../out/html/root/[jvm root]/generic.html          |  34 ---
 .../out/html/root/[jvm root]/index.html            |  50 ----
 .../out/html/root/[main root]/generic.html         |  34 +++
 .../out/html/root/[main root]/index.html           |  50 ++++
 .../genericFunction/out/html/root/index.html       |   4 +-
 .../genericFunction/out/html/root/package-list     |   4 +-
 .../out/html/navigation.html                       |   6 +-
 .../out/html/root/[jvm root]/generic.html          |  34 ---
 .../out/html/root/[jvm root]/index.html            |  50 ----
 .../out/html/root/[main root]/generic.html         |  34 +++
 .../out/html/root/[main root]/index.html           |  50 ++++
 .../out/html/root/index.html                       |   4 +-
 .../out/html/root/package-list                     |   4 +-
 .../expect/inlineFunction/out/html/navigation.html |   6 +-
 .../inlineFunction/out/html/root/[jvm root]/f.html |  32 ---
 .../out/html/root/[jvm root]/index.html            |  50 ----
 .../out/html/root/[main root]/f.html               |  32 +++
 .../out/html/root/[main root]/index.html           |  50 ++++
 .../expect/inlineFunction/out/html/root/index.html |   4 +-
 .../inlineFunction/out/html/root/package-list      |   4 +-
 .../inlineSuspendFunction/out/html/navigation.html |   6 +-
 .../out/html/root/[jvm root]/f.html                |  32 ---
 .../out/html/root/[jvm root]/index.html            |  50 ----
 .../out/html/root/[main root]/f.html               |  32 +++
 .../out/html/root/[main root]/index.html           |  50 ++++
 .../inlineSuspendFunction/out/html/root/index.html |   4 +-
 .../out/html/root/package-list                     |   4 +-
 .../expect/signatureTest/out/html/root/index.html  |   2 +-
 .../out/html/root/signatureTest/index.html         |   8 +-
 .../out/html/root/signatureTest/test.html          |   2 +-
 .../out/html/root/signatureTest/test2.html         |   2 +-
 .../expect/sinceKotlin/out/html/navigation.html    |   6 +-
 .../html/root/[jvm root]/available-since1.1.html   |  34 ---
 .../out/html/root/[jvm root]/index.html            |  50 ----
 .../html/root/[main root]/available-since1.1.html  |  34 +++
 .../out/html/root/[main root]/index.html           |  50 ++++
 .../expect/sinceKotlin/out/html/root/index.html    |   4 +-
 .../expect/sinceKotlin/out/html/root/package-list  |   4 +-
 .../suspendFunction/out/html/navigation.html       |   6 +-
 .../out/html/root/[jvm root]/f.html                |  32 ---
 .../out/html/root/[jvm root]/index.html            |  50 ----
 .../out/html/root/[main root]/f.html               |  32 +++
 .../out/html/root/[main root]/index.html           |  50 ++++
 .../suspendFunction/out/html/root/index.html       |   4 +-
 .../suspendFunction/out/html/root/package-list     |   4 +-
 .../suspendInlineFunction/out/html/navigation.html |   6 +-
 .../out/html/root/[jvm root]/f.html                |  32 ---
 .../out/html/root/[jvm root]/index.html            |  50 ----
 .../out/html/root/[main root]/f.html               |  32 +++
 .../out/html/root/[main root]/index.html           |  50 ++++
 .../suspendInlineFunction/out/html/root/index.html |   4 +-
 .../out/html/root/package-list                     |   4 +-
 plugins/gfm/src/main/kotlin/GfmPlugin.kt           |  11 +-
 .../kotlin/converters/KotlinToJavaConverter.kt     |  86 +++----
 .../kotlin/signatures/JavaSignatureProvider.kt     |   4 +-
 runners/cli/src/main/kotlin/cli/main.kt            |  11 +
 .../dokka/gradle/ConfigurationExtractor.kt         | 144 ++++++------
 .../kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt |  47 ++--
 .../dokka/gradle/configurationImplementations.kt   |   2 +
 .../main/kotlin/org/jetbrains/dokka/gradle/main.kt |   4 +-
 .../kotlin/org/jetbrains/dokka/gradle/utils.kt     |  14 +-
 runners/maven-plugin/src/main/kotlin/DokkaMojo.kt  |   7 +-
 .../src/main/kotlin/testApi/context/MockContext.kt |  12 +-
 .../testApi/testRunner/DokkaTestGenerator.kt       |  11 +-
 .../main/kotlin/testApi/testRunner/TestRunner.kt   |  10 +-
 193 files changed, 3010 insertions(+), 3003 deletions(-)
 create mode 100644 core/src/main/kotlin/model/SourceSetData.kt
 delete mode 100644 plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt
 create mode 100644 plugins/base/src/test/kotlin/renderers/html/SourceSetDependentHintTest.kt
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/f.html
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[main root]/f.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[main root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/pages.js
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/-init-.html
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/equals.html
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/hash-code.html
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/to-string.html
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/f.html
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/-init-.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/equals.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/hash-code.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/index.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/to-string.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/f.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/fn.html
 delete mode 100644 plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/function/out/html/root/[main root]/fn.html
 create mode 100644 plugins/base/src/test/resources/expect/function/out/html/root/[main root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/-init-.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/equals.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/hash-code.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/to-string.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/function.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/-init-.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/equals.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/hash-code.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/index.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/to-string.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/function.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/f.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[main root]/f.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[main root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/function.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[main root]/function.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[main root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/f.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[main root]/f.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[main root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/function.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[main root]/function.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[main root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/fn.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[main root]/fn.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[main root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/generic.html
 delete mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/root/[main root]/generic.html
 create mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/root/[main root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html
 delete mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[main root]/generic.html
 create mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[main root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/f.html
 delete mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[main root]/f.html
 create mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[main root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/f.html
 delete mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[main root]/f.html
 create mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[main root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/available-since1.1.html
 delete mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[main root]/available-since1.1.html
 create mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[main root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/f.html
 delete mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[main root]/f.html
 create mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[main root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/f.html
 delete mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/index.html
 create mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[main root]/f.html
 create mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[main root]/index.html

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 7ee14d19..a7e03ba2 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -16,8 +16,14 @@
       <module name="android-gradle-plugin_test" target="1.8" />
       <module name="ant_main" target="1.8" />
       <module name="ant_test" target="1.8" />
+      <module name="base.dokka.plugins.base.main" target="1.8" />
+      <module name="base.dokka.plugins.base.test" target="1.8" />
+      <module name="blazejkardys.Workspace.dokka.buildSrc.main" target="1.8" />
+      <module name="blazejkardys.Workspace.dokka.buildSrc.test" target="1.8" />
       <module name="buildSrc_main" target="1.8" />
       <module name="buildSrc_test" target="1.8" />
+      <module name="cli.dokka.runners.cli.main" target="1.8" />
+      <module name="cli.dokka.runners.cli.test" target="1.8" />
       <module name="cli_main" target="1.8" />
       <module name="cli_test" target="1.8" />
       <module name="core_main" target="1.8" />
@@ -78,14 +84,24 @@
       <module name="dokka.testApi.test" target="1.8" />
       <module name="fatjar_main" target="1.8" />
       <module name="fatjar_test" target="1.8" />
+      <module name="gradle-integration-tests.dokka.integration-tests.gradle-integration-tests.main" target="1.8" />
+      <module name="gradle-integration-tests.dokka.integration-tests.gradle-integration-tests.test" target="1.8" />
       <module name="gradle-integration-tests.org.jetbrains.dokka.gradle-integration-tests.main" target="1.8" />
       <module name="gradle-integration-tests.org.jetbrains.dokka.gradle-integration-tests.test" target="1.8" />
       <module name="gradle-integration-tests_main" target="1.8" />
       <module name="gradle-integration-tests_test" target="1.8" />
+      <module name="gradle-plugin.dokka.runners.gradle-plugin.main" target="1.8" />
+      <module name="gradle-plugin.dokka.runners.gradle-plugin.test" target="1.8" />
       <module name="gradle-plugin_main" target="1.8" />
       <module name="gradle-plugin_test" target="1.8" />
       <module name="integration_main" target="1.8" />
       <module name="integration_test" target="1.8" />
+      <module name="kotlin-as-java.dokka.plugins.kotlin-as-java.main" target="1.8" />
+      <module name="kotlin-as-java.dokka.plugins.kotlin-as-java.test" target="1.8" />
+      <module name="mathjax.dokka.plugins.mathjax.main" target="1.8" />
+      <module name="mathjax.dokka.plugins.mathjax.test" target="1.8" />
+      <module name="maven-plugin.dokka.runners.maven-plugin.main" target="1.8" />
+      <module name="maven-plugin.dokka.runners.maven-plugin.test" target="1.8" />
       <module name="maven-plugin_main" target="1.8" />
       <module name="maven-plugin_test" target="1.8" />
       <module name="org.jetbrains.dokka.android-gradle-plugin.main" target="1.8" />
@@ -101,6 +117,8 @@
       <module name="org.jetbrains.dokka.coreDependencies.main" target="1.8" />
       <module name="org.jetbrains.dokka.coreDependencies.test" target="1.8" />
       <module name="org.jetbrains.dokka.dokka.core.main" target="1.8" />
+      <module name="org.jetbrains.dokka.dokka.core.search-component.main" target="1.8" />
+      <module name="org.jetbrains.dokka.dokka.core.search-component.test" target="1.8" />
       <module name="org.jetbrains.dokka.dokka.core.test" target="1.8" />
       <module name="org.jetbrains.dokka.dokka.coreDependencies.main" target="1.8" />
       <module name="org.jetbrains.dokka.dokka.coreDependencies.test" target="1.8" />
@@ -110,6 +128,10 @@
       <module name="org.jetbrains.dokka.dokka.integration-tests.test" target="1.8" />
       <module name="org.jetbrains.dokka.dokka.plugins.base.main" target="1.8" />
       <module name="org.jetbrains.dokka.dokka.plugins.base.test" target="1.8" />
+      <module name="org.jetbrains.dokka.dokka.plugins.gfm.main" target="1.8" />
+      <module name="org.jetbrains.dokka.dokka.plugins.gfm.test" target="1.8" />
+      <module name="org.jetbrains.dokka.dokka.plugins.jekyll.main" target="1.8" />
+      <module name="org.jetbrains.dokka.dokka.plugins.jekyll.test" target="1.8" />
       <module name="org.jetbrains.dokka.dokka.plugins.kotlin-as-java.main" target="1.8" />
       <module name="org.jetbrains.dokka.dokka.plugins.kotlin-as-java.test" target="1.8" />
       <module name="org.jetbrains.dokka.dokka.plugins.main" target="1.8" />
@@ -126,6 +148,8 @@
       <module name="org.jetbrains.dokka.dokka.runners.test" target="1.8" />
       <module name="org.jetbrains.dokka.dokka.search-component.main" target="1.8" />
       <module name="org.jetbrains.dokka.dokka.search-component.test" target="1.8" />
+      <module name="org.jetbrains.dokka.dokka.test-tools.main" target="1.8" />
+      <module name="org.jetbrains.dokka.dokka.test-tools.test" target="1.8" />
       <module name="org.jetbrains.dokka.dokka.testApi.main" target="1.8" />
       <module name="org.jetbrains.dokka.dokka.testApi.test" target="1.8" />
       <module name="org.jetbrains.dokka.fatjar.main" target="1.8" />
@@ -150,6 +174,18 @@
       <module name="org.jetbrains.dokka.xml.test" target="1.8" />
       <module name="Workspace.dokka.buildSrc.main" target="1.8" />
       <module name="Workspace.dokka.buildSrc.test" target="1.8" />
+      <module name="Workspace.dokka.core.main" target="1.8" />
+      <module name="Workspace.dokka.core.test" target="1.8" />
+      <module name="Workspace.dokka.coreDependencies.main" target="1.8" />
+      <module name="Workspace.dokka.coreDependencies.test" target="1.8" />
+      <module name="Workspace.dokka.integration-tests.main" target="1.8" />
+      <module name="Workspace.dokka.integration-tests.test" target="1.8" />
+      <module name="Workspace.dokka.plugins.main" target="1.8" />
+      <module name="Workspace.dokka.plugins.test" target="1.8" />
+      <module name="Workspace.dokka.runners.main" target="1.8" />
+      <module name="Workspace.dokka.runners.test" target="1.8" />
+      <module name="Workspace.dokka.testApi.main" target="1.8" />
+      <module name="Workspace.dokka.testApi.test" target="1.8" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/core/src/main/kotlin/DokkaGenerator.kt b/core/src/main/kotlin/DokkaGenerator.kt
index 053b4cb6..6e62c033 100644
--- a/core/src/main/kotlin/DokkaGenerator.kt
+++ b/core/src/main/kotlin/DokkaGenerator.kt
@@ -1,23 +1,20 @@
 package org.jetbrains.dokka
 
-import com.intellij.openapi.vfs.VirtualFileManager
-import com.intellij.psi.PsiJavaFile
-import com.intellij.psi.PsiManager
 import org.jetbrains.dokka.analysis.AnalysisEnvironment
 import org.jetbrains.dokka.analysis.DokkaResolutionFacade
 import org.jetbrains.dokka.model.DModule
-import org.jetbrains.dokka.pages.PlatformData
+import org.jetbrains.dokka.model.SourceSetCache
+import org.jetbrains.dokka.model.SourceSetData
+import org.jetbrains.dokka.model.sourceSet
 import org.jetbrains.dokka.pages.RootPageNode
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.DokkaPlugin
 import org.jetbrains.dokka.utilities.DokkaLogger
-import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.common.messages.MessageRenderer
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
-import org.jetbrains.kotlin.cli.jvm.config.JavaSourceRoot
 import org.jetbrains.kotlin.utils.PathUtil
 import java.io.File
 
@@ -31,13 +28,14 @@ class DokkaGenerator(
 ) {
     fun generate() = timed {
         report("Setting up analysis environments")
-        val platforms: Map<PlatformData, EnvironmentAndFacade> = setUpAnalysis(configuration)
+        val sourceSetsCache = SourceSetCache()
+        val sourceSets: Map<SourceSetData, EnvironmentAndFacade> = setUpAnalysis(configuration, sourceSetsCache)
 
         report("Initializing plugins")
-        val context = initializePlugins(configuration, logger, platforms)
+        val context = initializePlugins(configuration, logger, sourceSets, sourceSetsCache)
 
         report("Creating documentation models")
-        val modulesFromPlatforms = createDocumentationModels(platforms, context)
+        val modulesFromPlatforms = createDocumentationModels(sourceSets, context)
 
         report("Transforming documentation model before merging")
         val transformedDocumentationBeforeMerge = transformDocumentationModelBeforeMerge(modulesFromPlatforms, context)
@@ -62,27 +60,31 @@ class DokkaGenerator(
         logger.report()
     }.dump("\n\n === TIME MEASUREMENT ===\n")
 
-    fun setUpAnalysis(configuration: DokkaConfiguration): Map<PlatformData, EnvironmentAndFacade> =
+    fun setUpAnalysis(
+        configuration: DokkaConfiguration,
+        sourceSetsCache: SourceSetCache
+    ): Map<SourceSetData, EnvironmentAndFacade> =
         configuration.passesConfigurations.map {
-            it.platformData to createEnvironmentAndFacade(it)
+            sourceSetsCache.getSourceSet(it) to createEnvironmentAndFacade(it)
         }.toMap()
 
     fun initializePlugins(
         configuration: DokkaConfiguration,
         logger: DokkaLogger,
-        platforms: Map<PlatformData, EnvironmentAndFacade>,
+        sourceSets: Map<SourceSetData, EnvironmentAndFacade>,
+        sourceSetsCache: SourceSetCache,
         pluginOverrides: List<DokkaPlugin> = emptyList()
-    ) = DokkaContext.create(configuration, logger, platforms, pluginOverrides)
+    ) = DokkaContext.create(configuration, logger, sourceSets, sourceSetsCache, pluginOverrides)
 
     fun createDocumentationModels(
-        platforms: Map<PlatformData, EnvironmentAndFacade>,
+        platforms: Map<SourceSetData, EnvironmentAndFacade>,
         context: DokkaContext
     ) = platforms.flatMap { (pdata, _) -> translateSources(pdata, context) }
 
     fun transformDocumentationModelBeforeMerge(
         modulesFromPlatforms: List<DModule>,
         context: DokkaContext
-    ) = context[CoreExtensions.preMergeDocumentableTransformer].fold(modulesFromPlatforms) { acc, t -> t(acc, context) }
+    ) = context[CoreExtensions.preMergeDocumentableTransformer].fold(modulesFromPlatforms) { acc, t -> t(acc) }
 
     fun mergeDocumentationModels(
         modulesFromPlatforms: List<DModule>,
@@ -119,7 +121,7 @@ class DokkaGenerator(
             }
             pass.classpath.forEach { addClasspath(File(it)) }
 
-            addSources(pass.sourceRoots.map { it.path })
+            addSources((pass.sourceRoots +  pass.dependentSourceRoots).map { it.path })
 
             loadLanguageVersionSettings(pass.languageVersion, pass.apiVersion)
 
@@ -128,7 +130,7 @@ class DokkaGenerator(
             EnvironmentAndFacade(environment, facade)
         }
 
-    private fun translateSources(platformData: PlatformData, context: DokkaContext) =
+    private fun translateSources(platformData: SourceSetData, context: DokkaContext) =
         context[CoreExtensions.sourceToDocumentableTranslator].map {
             it.invoke(platformData, context)
         }
diff --git a/core/src/main/kotlin/configuration.kt b/core/src/main/kotlin/configuration.kt
index 34671c4e..88924924 100644
--- a/core/src/main/kotlin/configuration.kt
+++ b/core/src/main/kotlin/configuration.kt
@@ -1,6 +1,5 @@
 package org.jetbrains.dokka
 
-import org.jetbrains.dokka.pages.PlatformData
 import java.io.File
 import java.net.URL
 
@@ -37,8 +36,10 @@ interface DokkaConfiguration {
 
     interface PassConfiguration {
         val moduleName: String
+        val sourceSetName: String
         val classpath: List<String>
         val sourceRoots: List<SourceRoot>
+        val dependentSourceRoots: List<SourceRoot>
         val samples: List<String>
         val includes: List<String>
         val includeNonPublic: Boolean
@@ -59,9 +60,6 @@ interface DokkaConfiguration {
         val analysisPlatform: Platform
         val targets: List<String>
         val sinceKotlin: String?
-
-        val platformData: PlatformData
-        get() = PlatformData(moduleName, analysisPlatform, targets)
     }
 
     interface SourceRoot {
diff --git a/core/src/main/kotlin/defaultConfiguration.kt b/core/src/main/kotlin/defaultConfiguration.kt
index ae674ea1..08f70b45 100644
--- a/core/src/main/kotlin/defaultConfiguration.kt
+++ b/core/src/main/kotlin/defaultConfiguration.kt
@@ -16,8 +16,10 @@ data class DokkaConfigurationImpl(
 
 data class PassConfigurationImpl (
     override val moduleName: String,
+    override val sourceSetName: String,
     override val classpath: List<String>,
     override val sourceRoots: List<SourceRootImpl>,
+    override val dependentSourceRoots: List<SourceRootImpl>,
     override val samples: List<String>,
     override val includes: List<String>,
     override val includeNonPublic: Boolean,
diff --git a/core/src/main/kotlin/model/Documentable.kt b/core/src/main/kotlin/model/Documentable.kt
index 313f4cd4..85487725 100644
--- a/core/src/main/kotlin/model/Documentable.kt
+++ b/core/src/main/kotlin/model/Documentable.kt
@@ -1,11 +1,12 @@
 package org.jetbrains.dokka.model
 
 import com.intellij.psi.PsiNamedElement
+import org.jetbrains.dokka.DokkaConfiguration
+import org.jetbrains.dokka.Platform
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.model.doc.DocumentationNode
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.dokka.model.properties.WithExtraProperties
-import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.load.kotlin.toSourceElement
 
@@ -13,8 +14,9 @@ abstract class Documentable {
     abstract val name: String?
     abstract val dri: DRI
     abstract val children: List<Documentable>
-    abstract val documentation: PlatformDependent<DocumentationNode>
-    abstract val platformData: List<PlatformData>
+    abstract val documentation: SourceSetDependent<DocumentationNode>
+    abstract val sourceSets: List<SourceSetData>
+    abstract val expectPresentInSet: SourceSetData?
 
     override fun toString(): String =
         "${javaClass.simpleName}($dri)"
@@ -25,45 +27,10 @@ abstract class Documentable {
     override fun hashCode() = dri.hashCode()
 }
 
-data class PlatformDependent<out T>(
-    val map: Map<PlatformData, T>,
-    val expect: T? = null
-) : Map<PlatformData, T> by map {
-    val prevalentValue: T?
-        get() = map.values.distinct().singleOrNull()
-
-    val allValues: Sequence<T> = sequence {
-        expect?.also { yield(it) }
-        yieldAll(map.values)
-    }
-
-    val allEntries: Sequence<Pair<PlatformData?, T>> = sequence {
-        expect?.also { yield(null to it) }
-        map.forEach { (k, v) -> yield(k to v) }
-    }
-
-    fun getOrExpect(platform: PlatformData): T? = map[platform] ?: expect
-
-    companion object {
-        fun <T> empty(): PlatformDependent<T> = PlatformDependent(emptyMap())
-
-        fun <T> from(platformData: PlatformData, element: T) = PlatformDependent(mapOf(platformData to element))
-
-        @Suppress("UNCHECKED_CAST")
-        fun <T> from(pairs: Iterable<Pair<PlatformData?, T>>) =
-            PlatformDependent(
-                pairs.filter { it.first != null }.toMap() as Map<PlatformData, T>,
-                pairs.firstOrNull { it.first == null }?.second
-            )
-
-        fun <T> from(vararg pairs: Pair<PlatformData?, T>) = from(pairs.asIterable())
-
-        fun <T> expectFrom(element: T) = PlatformDependent(map = emptyMap(), expect = element)
-    }
-}
+typealias SourceSetDependent<T> = Map<SourceSetData, T>
 
 interface WithExpectActual {
-    val sources: PlatformDependent<DocumentableSource>
+    val sources: SourceSetDependent<DocumentableSource>
 }
 
 interface WithScope {
@@ -73,7 +40,7 @@ interface WithScope {
 }
 
 interface WithVisibility {
-    val visibility: PlatformDependent<Visibility>
+    val visibility: SourceSetDependent<Visibility>
 }
 
 interface WithType {
@@ -81,7 +48,7 @@ interface WithType {
 }
 
 interface WithAbstraction {
-    val modifier: PlatformDependent<Modifier>
+    val modifier: SourceSetDependent<Modifier>
 }
 
 sealed class Modifier(val name: String)
@@ -112,7 +79,7 @@ interface WithGenerics {
 }
 
 interface WithSupertypes {
-    val supertypes: PlatformDependent<List<DRI>>
+    val supertypes: SourceSetDependent<List<DRI>>
 }
 
 interface Callable : WithVisibility, WithType, WithAbstraction, WithExpectActual {
@@ -124,8 +91,9 @@ sealed class DClasslike : Documentable(), WithScope, WithVisibility, WithExpectA
 data class DModule(
     override val name: String,
     val packages: List<DPackage>,
-    override val documentation: PlatformDependent<DocumentationNode>,
-    override val platformData: List<PlatformData>,
+    override val documentation: SourceSetDependent<DocumentationNode>,
+    override val expectPresentInSet: SourceSetData? = null,
+    override val sourceSets: List<SourceSetData>,
     override val extra: PropertyContainer<DModule> = PropertyContainer.empty()
 ) : Documentable(), WithExtraProperties<DModule> {
     override val dri: DRI = DRI.topLevel
@@ -141,8 +109,9 @@ data class DPackage(
     override val properties: List<DProperty>,
     override val classlikes: List<DClasslike>,
     val typealiases: List<DTypeAlias>,
-    override val documentation: PlatformDependent<DocumentationNode>,
-    override val platformData: List<PlatformData>,
+    override val documentation: SourceSetDependent<DocumentationNode>,
+    override val expectPresentInSet: SourceSetData? = null,
+    override val sourceSets: List<SourceSetData>,
     override val extra: PropertyContainer<DPackage> = PropertyContainer.empty()
 ) : Documentable(), WithScope, WithExtraProperties<DPackage> {
     override val name = dri.packageName.orEmpty()
@@ -159,14 +128,15 @@ data class DClass(
     override val functions: List<DFunction>,
     override val properties: List<DProperty>,
     override val classlikes: List<DClasslike>,
-    override val sources: PlatformDependent<DocumentableSource>,
-    override val visibility: PlatformDependent<Visibility>,
+    override val sources: SourceSetDependent<DocumentableSource>,
+    override val visibility: SourceSetDependent<Visibility>,
     override val companion: DObject?,
     override val generics: List<DTypeParameter>,
-    override val supertypes: PlatformDependent<List<DRI>>,
-    override val documentation: PlatformDependent<DocumentationNode>,
-    override val modifier: PlatformDependent<Modifier>,
-    override val platformData: List<PlatformData>,
+    override val supertypes: SourceSetDependent<List<DRI>>,
+    override val documentation: SourceSetDependent<DocumentationNode>,
+    override val expectPresentInSet: SourceSetData?,
+    override val modifier: SourceSetDependent<Modifier>,
+    override val sourceSets: List<SourceSetData>,
     override val extra: PropertyContainer<DClass> = PropertyContainer.empty()
 ) : DClasslike(), WithAbstraction, WithCompanion, WithConstructors, WithGenerics, WithSupertypes,
     WithExtraProperties<DClass> {
@@ -181,16 +151,17 @@ data class DEnum(
     override val dri: DRI,
     override val name: String,
     val entries: List<DEnumEntry>,
-    override val documentation: PlatformDependent<DocumentationNode>,
-    override val sources: PlatformDependent<DocumentableSource>,
+    override val documentation: SourceSetDependent<DocumentationNode>,
+    override val expectPresentInSet: SourceSetData?,
+    override val sources: SourceSetDependent<DocumentableSource>,
     override val functions: List<DFunction>,
     override val properties: List<DProperty>,
     override val classlikes: List<DClasslike>,
-    override val visibility: PlatformDependent<Visibility>,
+    override val visibility: SourceSetDependent<Visibility>,
     override val companion: DObject?,
     override val constructors: List<DFunction>,
-    override val supertypes: PlatformDependent<List<DRI>>,
-    override val platformData: List<PlatformData>,
+    override val supertypes: SourceSetDependent<List<DRI>>,
+    override val sourceSets: List<SourceSetData>,
     override val extra: PropertyContainer<DEnum> = PropertyContainer.empty()
 ) : DClasslike(), WithCompanion, WithConstructors, WithSupertypes, WithExtraProperties<DEnum> {
     override val children: List<Documentable>
@@ -202,11 +173,12 @@ data class DEnum(
 data class DEnumEntry(
     override val dri: DRI,
     override val name: String,
-    override val documentation: PlatformDependent<DocumentationNode>,
+    override val documentation: SourceSetDependent<DocumentationNode>,
+    override val expectPresentInSet: SourceSetData?,
     override val functions: List<DFunction>,
     override val properties: List<DProperty>,
     override val classlikes: List<DClasslike>,
-    override val platformData: List<PlatformData>,
+    override val sourceSets: List<SourceSetData>,
     override val extra: PropertyContainer<DEnumEntry> = PropertyContainer.empty()
 ) : Documentable(), WithScope, WithExtraProperties<DEnumEntry> {
     override val children: List<Documentable>
@@ -220,14 +192,15 @@ data class DFunction(
     override val name: String,
     val isConstructor: Boolean,
     val parameters: List<DParameter>,
-    override val documentation: PlatformDependent<DocumentationNode>,
-    override val sources: PlatformDependent<DocumentableSource>,
-    override val visibility: PlatformDependent<Visibility>,
+    override val documentation: SourceSetDependent<DocumentationNode>,
+    override val expectPresentInSet: SourceSetData?,
+    override val sources: SourceSetDependent<DocumentableSource>,
+    override val visibility: SourceSetDependent<Visibility>,
     override val type: Bound,
     override val generics: List<DTypeParameter>,
     override val receiver: DParameter?,
-    override val modifier: PlatformDependent<Modifier>,
-    override val platformData: List<PlatformData>,
+    override val modifier: SourceSetDependent<Modifier>,
+    override val sourceSets: List<SourceSetData>,
     override val extra: PropertyContainer<DFunction> = PropertyContainer.empty()
 ) : Documentable(), Callable, WithGenerics, WithExtraProperties<DFunction> {
     override val children: List<Documentable>
@@ -239,16 +212,17 @@ data class DFunction(
 data class DInterface(
     override val dri: DRI,
     override val name: String,
-    override val documentation: PlatformDependent<DocumentationNode>,
-    override val sources: PlatformDependent<DocumentableSource>,
+    override val documentation: SourceSetDependent<DocumentationNode>,
+    override val expectPresentInSet: SourceSetData?,
+    override val sources: SourceSetDependent<DocumentableSource>,
     override val functions: List<DFunction>,
     override val properties: List<DProperty>,
     override val classlikes: List<DClasslike>,
-    override val visibility: PlatformDependent<Visibility>,
+    override val visibility: SourceSetDependent<Visibility>,
     override val companion: DObject?,
     override val generics: List<DTypeParameter>,
-    override val supertypes: PlatformDependent<List<DRI>>,
-    override val platformData: List<PlatformData>,
+    override val supertypes: SourceSetDependent<List<DRI>>,
+    override val sourceSets: List<SourceSetData>,
     override val extra: PropertyContainer<DInterface> = PropertyContainer.empty()
 ) : DClasslike(), WithCompanion, WithGenerics, WithSupertypes, WithExtraProperties<DInterface> {
     override val children: List<Documentable>
@@ -260,14 +234,15 @@ data class DInterface(
 data class DObject(
     override val name: String?,
     override val dri: DRI,
-    override val documentation: PlatformDependent<DocumentationNode>,
-    override val sources: PlatformDependent<DocumentableSource>,
+    override val documentation: SourceSetDependent<DocumentationNode>,
+    override val expectPresentInSet: SourceSetData?,
+    override val sources: SourceSetDependent<DocumentableSource>,
     override val functions: List<DFunction>,
     override val properties: List<DProperty>,
     override val classlikes: List<DClasslike>,
-    override val visibility: PlatformDependent<Visibility>,
-    override val supertypes: PlatformDependent<List<DRI>>,
-    override val platformData: List<PlatformData>,
+    override val visibility: SourceSetDependent<Visibility>,
+    override val supertypes: SourceSetDependent<List<DRI>>,
+    override val sourceSets: List<SourceSetData>,
     override val extra: PropertyContainer<DObject> = PropertyContainer.empty()
 ) : DClasslike(), WithSupertypes, WithExtraProperties<DObject> {
     override val children: List<Documentable>
@@ -279,15 +254,16 @@ data class DObject(
 data class DAnnotation(
     override val name: String,
     override val dri: DRI,
-    override val documentation: PlatformDependent<DocumentationNode>,
-    override val sources: PlatformDependent<DocumentableSource>,
+    override val documentation: SourceSetDependent<DocumentationNode>,
+    override val expectPresentInSet: SourceSetData?,
+    override val sources: SourceSetDependent<DocumentableSource>,
     override val functions: List<DFunction>,
     override val properties: List<DProperty>,
     override val classlikes: List<DClasslike>,
-    override val visibility: PlatformDependent<Visibility>,
+    override val visibility: SourceSetDependent<Visibility>,
     override val companion: DObject?,
     override val constructors: List<DFunction>,
-    override val platformData: List<PlatformData>,
+    override val sourceSets: List<SourceSetData>,
     override val extra: PropertyContainer<DAnnotation> = PropertyContainer.empty()
 ) : DClasslike(), WithCompanion, WithConstructors, WithExtraProperties<DAnnotation> {
     override val children: List<Documentable>
@@ -299,15 +275,16 @@ data class DAnnotation(
 data class DProperty(
     override val dri: DRI,
     override val name: String,
-    override val documentation: PlatformDependent<DocumentationNode>,
-    override val sources: PlatformDependent<DocumentableSource>,
-    override val visibility: PlatformDependent<Visibility>,
+    override val documentation: SourceSetDependent<DocumentationNode>,
+    override val expectPresentInSet: SourceSetData?,
+    override val sources: SourceSetDependent<DocumentableSource>,
+    override val visibility: SourceSetDependent<Visibility>,
     override val type: Bound,
     override val receiver: DParameter?,
     val setter: DFunction?,
     val getter: DFunction?,
-    override val modifier: PlatformDependent<Modifier>,
-    override val platformData: List<PlatformData>,
+    override val modifier: SourceSetDependent<Modifier>,
+    override val sourceSets: List<SourceSetData>,
     override val generics: List<DTypeParameter>,
     override val extra: PropertyContainer<DProperty> = PropertyContainer.empty()
 ) : Documentable(), Callable, WithExtraProperties<DProperty>, WithGenerics {
@@ -321,9 +298,10 @@ data class DProperty(
 data class DParameter(
     override val dri: DRI,
     override val name: String?,
-    override val documentation: PlatformDependent<DocumentationNode>,
+    override val documentation: SourceSetDependent<DocumentationNode>,
+    override val expectPresentInSet: SourceSetData?,
     val type: Bound,
-    override val platformData: List<PlatformData>,
+    override val sourceSets: List<SourceSetData>,
     override val extra: PropertyContainer<DParameter> = PropertyContainer.empty()
 ) : Documentable(), WithExtraProperties<DParameter> {
     override val children: List<Nothing>
@@ -335,9 +313,10 @@ data class DParameter(
 data class DTypeParameter(
     override val dri: DRI,
     override val name: String,
-    override val documentation: PlatformDependent<DocumentationNode>,
+    override val documentation: SourceSetDependent<DocumentationNode>,
+    override val expectPresentInSet: SourceSetData?,
     val bounds: List<Bound>,
-    override val platformData: List<PlatformData>,
+    override val sourceSets: List<SourceSetData>,
     override val extra: PropertyContainer<DTypeParameter> = PropertyContainer.empty()
 ) : Documentable(), WithExtraProperties<DTypeParameter> {
     override val children: List<Nothing>
@@ -350,10 +329,11 @@ data class DTypeAlias(
     override val dri: DRI,
     override val name: String,
     override val type: Bound,
-    val underlyingType: PlatformDependent<Bound>,
-    override val visibility: PlatformDependent<Visibility>,
-    override val documentation: PlatformDependent<DocumentationNode>,
-    override val platformData: List<PlatformData>,
+    val underlyingType: SourceSetDependent<Bound>,
+    override val visibility: SourceSetDependent<Visibility>,
+    override val documentation: SourceSetDependent<DocumentationNode>,
+    override val expectPresentInSet: SourceSetData?,
+    override val sourceSets: List<SourceSetData>,
     override val extra: PropertyContainer<DTypeAlias> = PropertyContainer.empty()
 ) : Documentable(), WithType, WithVisibility, WithExtraProperties<DTypeAlias> {
     override val children: List<Nothing>
@@ -417,7 +397,7 @@ sealed class JavaVisibility(name: String) : Visibility(name) {
     object Default : JavaVisibility("")
 }
 
-fun <T> PlatformDependent<T>?.orEmpty(): PlatformDependent<T> = this ?: PlatformDependent.empty()
+fun <T> SourceSetDependent<T>?.orEmpty(): SourceSetDependent<T> = this ?: emptyMap()
 
 interface DocumentableSource {
     val path: String
@@ -429,4 +409,4 @@ class DescriptorDocumentableSource(val descriptor: DeclarationDescriptor) : Docu
 
 class PsiDocumentableSource(val psi: PsiNamedElement) : DocumentableSource {
     override val path = psi.containingFile.virtualFile.path
-}
+}
\ No newline at end of file
diff --git a/core/src/main/kotlin/model/SourceSetData.kt b/core/src/main/kotlin/model/SourceSetData.kt
new file mode 100644
index 00000000..8f67f272
--- /dev/null
+++ b/core/src/main/kotlin/model/SourceSetData.kt
@@ -0,0 +1,23 @@
+package org.jetbrains.dokka.model
+
+import org.jetbrains.dokka.DokkaConfiguration
+import org.jetbrains.dokka.Platform
+import org.jetbrains.dokka.plugability.DokkaContext
+
+data class SourceSetData(
+    val moduleName: String,
+    val sourceSetName: String,
+    val platform: Platform,
+    val sourceRoots: List<DokkaConfiguration.SourceRoot> = emptyList()
+)
+
+class SourceSetCache {
+    private val sourceSets = HashMap<String, SourceSetData>()
+
+    fun getSourceSet(pass: DokkaConfiguration.PassConfiguration) =
+        sourceSets.getOrPut("${pass.moduleName}/${pass.sourceSetName}",
+            { SourceSetData(pass.moduleName, pass.sourceSetName, pass.analysisPlatform, pass.sourceRoots) }
+        )
+}
+
+fun DokkaContext.sourceSet(pass: DokkaConfiguration.PassConfiguration) : SourceSetData = sourceSetCache.getSourceSet(pass)
\ No newline at end of file
diff --git a/core/src/main/kotlin/model/aditionalExtras.kt b/core/src/main/kotlin/model/aditionalExtras.kt
index 58209939..27ad8a55 100644
--- a/core/src/main/kotlin/model/aditionalExtras.kt
+++ b/core/src/main/kotlin/model/aditionalExtras.kt
@@ -41,13 +41,13 @@ object PrimaryConstructorExtra : ExtraProperty<DFunction>, ExtraProperty.Key<DFu
     override val key: ExtraProperty.Key<DFunction, *> = this
 }
 
-data class ActualTypealias(val underlyingType: PlatformDependent<Bound>) : ExtraProperty<DClasslike> {
+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(PlatformDependent(left.underlyingType + right.underlyingType)))
+            MergeStrategy.Replace(ActualTypealias(left.underlyingType + right.underlyingType))
     }
 
     override val key: ExtraProperty.Key<DClasslike, ActualTypealias> = ActualTypealias
diff --git a/core/src/main/kotlin/model/documentableUtils.kt b/core/src/main/kotlin/model/documentableUtils.kt
index 7f946344..b09260ee 100644
--- a/core/src/main/kotlin/model/documentableUtils.kt
+++ b/core/src/main/kotlin/model/documentableUtils.kt
@@ -1,21 +1,18 @@
 package org.jetbrains.dokka.model
 
-import org.jetbrains.dokka.pages.PlatformData
+fun <T> SourceSetDependent<T>.filtered(platformDataList: List<SourceSetData>) = filter { it.key in platformDataList }
+fun SourceSetData?.filtered(platformDataList: List<SourceSetData>) = takeIf { this in platformDataList }
 
-fun <T> PlatformDependent<T>.filtered(platformDataList: List<PlatformData>) = PlatformDependent(
-    map.filter { it.key in platformDataList },
-    expect
-)
-
-fun DTypeParameter.filter(filteredData: List<PlatformData>) =
-    if (filteredData.containsAll(platformData)) this
+fun DTypeParameter.filter(filteredData: List<SourceSetData>) =
+    if (filteredData.containsAll(sourceSets)) this
     else {
-        val intersection = filteredData.intersect(platformData).toList()
+        val intersection = filteredData.intersect(sourceSets).toList()
         if (intersection.isEmpty()) null
         else DTypeParameter(
             dri,
             name,
             documentation.filtered(intersection),
+            expectPresentInSet?.takeIf { intersection.contains(expectPresentInSet) },
             bounds,
             intersection,
             extra
diff --git a/core/src/main/kotlin/pages/ContentNodes.kt b/core/src/main/kotlin/pages/ContentNodes.kt
index 26bcdf77..bb669199 100644
--- a/core/src/main/kotlin/pages/ContentNodes.kt
+++ b/core/src/main/kotlin/pages/ContentNodes.kt
@@ -1,6 +1,7 @@
 package org.jetbrains.dokka.pages
 
 import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.dokka.model.properties.WithExtraProperties
 
@@ -10,7 +11,7 @@ data class DCI(val dri: Set<DRI>, val kind: Kind) {
 
 interface ContentNode : WithExtraProperties<ContentNode> {
     val dci: DCI
-    val platforms: Set<PlatformData>
+    val sourceSets: Set<SourceSetData>
     val style: Set<Style>
 }
 
@@ -18,7 +19,7 @@ interface ContentNode : WithExtraProperties<ContentNode> {
 data class ContentText(
     val text: String,
     override val dci: DCI,
-    override val platforms: Set<PlatformData>,
+    override val sourceSets: Set<SourceSetData>,
     override val style: Set<Style> = emptySet(),
     override val extra: PropertyContainer<ContentNode> = PropertyContainer.empty()
 ) : ContentNode {
@@ -27,7 +28,7 @@ data class ContentText(
 
 // TODO: Remove
 data class ContentBreakLine(
-    override val platforms: Set<PlatformData>,
+    override val sourceSets: Set<SourceSetData>,
     override val dci: DCI = DCI(emptySet(), ContentKind.Empty),
     override val style: Set<Style> = emptySet(),
     override val extra: PropertyContainer<ContentNode> = PropertyContainer.empty()
@@ -40,11 +41,11 @@ data class ContentHeader(
     override val children: List<ContentNode>,
     val level: Int,
     override val dci: DCI,
-    override val platforms: Set<PlatformData>,
+    override val sourceSets: Set<SourceSetData>,
     override val style: Set<Style>,
     override val extra: PropertyContainer<ContentNode> = PropertyContainer.empty()
 ) : ContentComposite {
-    constructor(level: Int, c: ContentComposite) : this(c.children, level, c.dci, c.platforms, c.style, c.extra)
+    constructor(level: Int, c: ContentComposite) : this(c.children, level, c.dci, c.sourceSets, c.style, c.extra)
 
     override fun withNewExtras(newExtras: PropertyContainer<ContentNode>): ContentHeader = copy(extra = newExtras)
 }
@@ -54,7 +55,7 @@ data class ContentCode(
     override val children: List<ContentNode>,
     val language: String,
     override val dci: DCI,
-    override val platforms: Set<PlatformData>,
+    override val sourceSets: Set<SourceSetData>,
     override val style: Set<Style>,
     override val extra: PropertyContainer<ContentNode> = PropertyContainer.empty()
 ) : ContentComposite {
@@ -69,7 +70,7 @@ data class ContentDRILink(
     override val children: List<ContentNode>,
     val address: DRI,
     override val dci: DCI,
-    override val platforms: Set<PlatformData>,
+    override val sourceSets: Set<SourceSetData>,
     override val style: Set<Style> = emptySet(),
     override val extra: PropertyContainer<ContentNode> = PropertyContainer.empty()
 ) : ContentLink {
@@ -81,7 +82,7 @@ data class ContentResolvedLink(
     override val children: List<ContentNode>,
     val address: String,
     override val dci: DCI,
-    override val platforms: Set<PlatformData>,
+    override val sourceSets: Set<SourceSetData>,
     override val style: Set<Style> = emptySet(),
     override val extra: PropertyContainer<ContentNode> = PropertyContainer.empty()
 ) : ContentLink {
@@ -95,7 +96,7 @@ data class ContentEmbeddedResource(
     val address: String,
     val altText: String?,
     override val dci: DCI,
-    override val platforms: Set<PlatformData>,
+    override val sourceSets: Set<SourceSetData>,
     override val style: Set<Style> = emptySet(),
     override val extra: PropertyContainer<ContentNode> = PropertyContainer.empty()
 ) : ContentLink {
@@ -113,7 +114,7 @@ data class ContentTable(
     val header: List<ContentGroup>,
     override val children: List<ContentGroup>,
     override val dci: DCI,
-    override val platforms: Set<PlatformData>,
+    override val sourceSets: Set<SourceSetData>,
     override val style: Set<Style>,
     override val extra: PropertyContainer<ContentNode> = PropertyContainer.empty()
 ) : ContentComposite {
@@ -125,7 +126,7 @@ data class ContentList(
     override val children: List<ContentNode>,
     val ordered: Boolean,
     override val dci: DCI,
-    override val platforms: Set<PlatformData>,
+    override val sourceSets: Set<SourceSetData>,
     override val style: Set<Style>,
     override val extra: PropertyContainer<ContentNode> = PropertyContainer.empty()
 ) : ContentComposite {
@@ -136,7 +137,7 @@ data class ContentList(
 data class ContentGroup(
     override val children: List<ContentNode>,
     override val dci: DCI,
-    override val platforms: Set<PlatformData>,
+    override val sourceSets: Set<SourceSetData>,
     override val style: Set<Style>,
     override val extra: PropertyContainer<ContentNode> = PropertyContainer.empty()
 ) : ContentComposite {
@@ -145,7 +146,7 @@ data class ContentGroup(
 
 data class PlatformHintedContent(
     val inner: ContentNode,
-    override val platforms: Set<PlatformData>
+    override val sourceSets: Set<SourceSetData>
 ) : ContentComposite {
     override val children = listOf(inner)
 
@@ -171,7 +172,7 @@ interface Kind
 enum class ContentKind : Kind {
 
     Comment, Constructors, Functions, Parameters, Properties, Classlikes, Packages, Symbol, Sample, Main, BriefComment,
-    Empty, Source, TypeAliases, Cover, Inheritors, PlatformDependantHint;
+    Empty, Source, TypeAliases, Cover, Inheritors, SourceSetDependantHint;
 
     companion object {
         private val platformTagged =
diff --git a/core/src/main/kotlin/pages/PageNodes.kt b/core/src/main/kotlin/pages/PageNodes.kt
index 244d951e..32b2846e 100644
--- a/core/src/main/kotlin/pages/PageNodes.kt
+++ b/core/src/main/kotlin/pages/PageNodes.kt
@@ -1,5 +1,6 @@
 package org.jetbrains.dokka.pages
 
+import org.jetbrains.dokka.DokkaConfiguration
 import org.jetbrains.dokka.model.Documentable
 import org.jetbrains.dokka.Platform
 import org.jetbrains.dokka.links.DRI
@@ -151,10 +152,6 @@ class MemberPageNode(
         else MemberPageNode(name, content, dri, documentable, children, embeddedResources)
 }
 
-data class PlatformData(val name: String, val platformType: Platform, val targets: List<String>) {
-    override fun toString() = targets.toString()
-}
-
 fun PageNode.dfs(predicate: (PageNode) -> Boolean): PageNode? = if (predicate(this)) {
     this
 } else {
diff --git a/core/src/main/kotlin/plugability/DokkaContext.kt b/core/src/main/kotlin/plugability/DokkaContext.kt
index cefcd286..692803dd 100644
--- a/core/src/main/kotlin/plugability/DokkaContext.kt
+++ b/core/src/main/kotlin/plugability/DokkaContext.kt
@@ -2,7 +2,8 @@ package org.jetbrains.dokka.plugability
 
 import org.jetbrains.dokka.DokkaConfiguration
 import org.jetbrains.dokka.EnvironmentAndFacade
-import org.jetbrains.dokka.pages.PlatformData
+import org.jetbrains.dokka.model.SourceSetCache
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.utilities.DokkaLogger
 import java.io.File
 import java.net.URLClassLoader
@@ -19,9 +20,10 @@ interface DokkaContext {
 
     fun <T, E> single(point: E): T where T : Any, E : ExtensionPoint<T>
 
+    val sourceSetCache: SourceSetCache
     val logger: DokkaLogger
     val configuration: DokkaConfiguration
-    val platforms: Map<PlatformData, EnvironmentAndFacade>
+    val platforms: Map<SourceSetData, EnvironmentAndFacade>
     val unusedPoints: Collection<ExtensionPoint<*>>
 
 
@@ -29,10 +31,11 @@ interface DokkaContext {
         fun create(
             configuration: DokkaConfiguration,
             logger: DokkaLogger,
-            platforms: Map<PlatformData, EnvironmentAndFacade>,
+            sourceSets: Map<SourceSetData, EnvironmentAndFacade>,
+            sourceSetsCache: SourceSetCache,
             pluginOverrides: List<DokkaPlugin>
         ): DokkaContext =
-            DokkaContextConfigurationImpl(logger, configuration, platforms).apply {
+            DokkaContextConfigurationImpl(logger, configuration, sourceSets, sourceSetsCache).apply {
                 // File(it.path) is a workaround for an incorrect filesystem in a File instance returned by Gradle.
                 configuration.pluginsClasspath.map { File(it.path).toURI().toURL() }
                     .toTypedArray()
@@ -56,7 +59,8 @@ interface DokkaContextConfiguration {
 private class DokkaContextConfigurationImpl(
     override val logger: DokkaLogger,
     override val configuration: DokkaConfiguration,
-    override val platforms: Map<PlatformData, EnvironmentAndFacade>
+    override val platforms: Map<SourceSetData, EnvironmentAndFacade>,
+    override val sourceSetCache: SourceSetCache
 ) : DokkaContext, DokkaContextConfiguration {
     private val plugins = mutableMapOf<KClass<*>, DokkaPlugin>()
     private val pluginStubs = mutableMapOf<KClass<*>, DokkaPlugin>()
diff --git a/core/src/main/kotlin/transformers/documentation/PreMergeDocumentableTransformer.kt b/core/src/main/kotlin/transformers/documentation/PreMergeDocumentableTransformer.kt
index dfb1f26b..b67a1d57 100644
--- a/core/src/main/kotlin/transformers/documentation/PreMergeDocumentableTransformer.kt
+++ b/core/src/main/kotlin/transformers/documentation/PreMergeDocumentableTransformer.kt
@@ -4,5 +4,5 @@ import org.jetbrains.dokka.model.DModule
 import org.jetbrains.dokka.plugability.DokkaContext
 
 interface PreMergeDocumentableTransformer {
-    operator fun invoke(modules: List<DModule>, context: DokkaContext): List<DModule>
+    operator fun invoke(modules: List<DModule>): List<DModule>
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/transformers/sources/SourceToDocumentableTranslator.kt b/core/src/main/kotlin/transformers/sources/SourceToDocumentableTranslator.kt
index a138b3e2..f9c0a3d0 100644
--- a/core/src/main/kotlin/transformers/sources/SourceToDocumentableTranslator.kt
+++ b/core/src/main/kotlin/transformers/sources/SourceToDocumentableTranslator.kt
@@ -1,9 +1,9 @@
 package org.jetbrains.dokka.transformers.sources
 
 import org.jetbrains.dokka.model.DModule
-import org.jetbrains.dokka.pages.PlatformData
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.plugability.DokkaContext
 
 interface SourceToDocumentableTranslator {
-    fun invoke(platformData: PlatformData, context: DokkaContext): DModule
+    fun invoke(sourceSet: SourceSetData, context: DokkaContext): DModule
 }
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/DokkaBase.kt b/plugins/base/src/main/kotlin/DokkaBase.kt
index 2da3fbd4..ab7d089d 100644
--- a/plugins/base/src/main/kotlin/DokkaBase.kt
+++ b/plugins/base/src/main/kotlin/DokkaBase.kt
@@ -54,15 +54,15 @@ class DokkaBase : DokkaPlugin() {
     }
 
     val preMergeDocumentableTransformer by extending(isFallback = true) {
-        CoreExtensions.preMergeDocumentableTransformer with DocumentableVisibilityFilter
+        CoreExtensions.preMergeDocumentableTransformer providing ::DocumentableVisibilityFilter
     }
 
     val actualTypealiasAdder by extending {
-        CoreExtensions.preMergeDocumentableTransformer with ActualTypealiasAdder()
+        CoreExtensions.preMergeDocumentableTransformer providing ::ActualTypealiasAdder
     }
 
     val modulesAndPackagesDocumentation by extending(isFallback = true) {
-        CoreExtensions.preMergeDocumentableTransformer with ModuleAndPackageDocumentationTransformer
+        CoreExtensions.preMergeDocumentableTransformer providing ::ModuleAndPackageDocumentationTransformer
     }
 
     val kotlinSignatureProvider by extending(isFallback = true) {
diff --git a/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt b/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt
index 925767ce..1340529c 100644
--- a/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt
+++ b/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt
@@ -3,6 +3,7 @@ package org.jetbrains.dokka.base.renderers
 import kotlinx.coroutines.*
 import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.resolvers.local.LocationProvider
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.plugin
@@ -26,7 +27,7 @@ abstract class DefaultRenderer<T>(
     abstract fun T.buildList(
         node: ContentList,
         pageContext: ContentPage,
-        platformRestriction: PlatformData? = null
+        platformRestriction: SourceSetData? = null
     )
 
     abstract fun T.buildNewLine()
@@ -34,7 +35,7 @@ abstract class DefaultRenderer<T>(
     abstract fun T.buildTable(
         node: ContentTable,
         pageContext: ContentPage,
-        platformRestriction: PlatformData? = null
+        platformRestriction: SourceSetData? = null
     )
 
     abstract fun T.buildText(textNode: ContentText)
@@ -49,7 +50,7 @@ abstract class DefaultRenderer<T>(
     open fun T.buildGroup(
         node: ContentGroup,
         pageContext: ContentPage,
-        platformRestriction: PlatformData? = null
+        platformRestriction: SourceSetData? = null
     ) =
         wrapGroup(node, pageContext) { node.children.forEach { it.build(this, pageContext, platformRestriction) } }
 
@@ -59,7 +60,7 @@ abstract class DefaultRenderer<T>(
     open fun T.buildLinkText(
         nodes: List<ContentNode>,
         pageContext: ContentPage,
-        platformRestriction: PlatformData? = null
+        platformRestriction: SourceSetData? = null
     ) {
         nodes.forEach { it.build(this, pageContext, platformRestriction) }
     }
@@ -71,7 +72,7 @@ abstract class DefaultRenderer<T>(
     open fun T.buildHeader(
         node: ContentHeader,
         pageContext: ContentPage,
-        platformRestriction: PlatformData? = null
+        platformRestriction: SourceSetData? = null
     ) {
         buildHeader(node.level) { node.children.forEach { it.build(this, pageContext, platformRestriction) } }
     }
@@ -79,22 +80,22 @@ abstract class DefaultRenderer<T>(
     open fun ContentNode.build(
         builder: T,
         pageContext: ContentPage,
-        platformRestriction: PlatformData? = null
+        platformRestriction: SourceSetData? = null
     ) =
         builder.buildContentNode(this, pageContext, platformRestriction)
 
     open fun T.buildContentNode(
         node: ContentNode,
         pageContext: ContentPage,
-        platformRestriction: PlatformData? = null
+        platformRestriction: SourceSetData? = null
     ) {
-        if (platformRestriction == null || platformRestriction in node.platforms) {
+        if (platformRestriction == null || platformRestriction in node.sourceSets) {
             when (node) {
                 is ContentText -> buildText(node)
                 is ContentHeader -> buildHeader(node, pageContext, platformRestriction)
                 is ContentCode -> buildCode(node.children, node.language, pageContext)
                 is ContentDRILink ->
-                    buildLink(locationProvider.resolve(node.address, node.platforms.toList(), pageContext)) {
+                    buildLink(locationProvider.resolve(node.address, node.sourceSets.toList(), pageContext)) {
                         buildLinkText(node.children, pageContext, platformRestriction)
                     }
                 is ContentResolvedLink -> buildLink(node.address) {
@@ -154,4 +155,4 @@ abstract class DefaultRenderer<T>(
     }
 }
 
-fun ContentPage.platforms() = this.content.platforms.toList()
\ No newline at end of file
+fun ContentPage.platforms() = this.content.sourceSets.toList()
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
index c061cabf..caabcda7 100644
--- a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
+++ b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
@@ -7,6 +7,7 @@ import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.renderers.DefaultRenderer
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.model.DFunction
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.plugin
@@ -42,10 +43,10 @@ open class HtmlRenderer(
     override fun FlowContent.buildPlatformDependent(content: PlatformHintedContent, pageContext: ContentPage) {
         div("platform-hinted") {
             attributes["data-platform-hinted"] = "data-platform-hinted"
-            val contents = content.platforms.mapIndexed { index, platform ->
+            val contents = content.sourceSets.mapIndexed { index, platform ->
                 platform to createHTML(prettyPrint = false).div(classes = "content") {
                     if (index == 0) attributes["data-active"] = ""
-                    attributes["data-togglable"] = platform.targets.joinToString("-")
+                    attributes["data-togglable"] = platform.sourceSetName
                     buildContentNode(content.inner, pageContext, platform)
                 }
             }
@@ -56,8 +57,8 @@ open class HtmlRenderer(
                     contents.forEachIndexed { index, pair ->
                         button(classes = "platform-bookmark") {
                             if (index == 0) attributes["data-active"] = ""
-                            attributes["data-toggle"] = pair.first.targets.joinToString("-")
-                            text(pair.first.targets.joinToString(", "));
+                            attributes["data-toggle"] = pair.first.sourceSetName
+                            text(pair.first.sourceSetName)
                         }
                     }
                 }
@@ -71,27 +72,27 @@ open class HtmlRenderer(
     override fun FlowContent.buildList(
         node: ContentList,
         pageContext: ContentPage,
-        platformRestriction: PlatformData?
-    ) = if (node.ordered) ol { buildListItems(node.children, pageContext, platformRestriction) }
-    else ul { buildListItems(node.children, pageContext, platformRestriction) }
+        sourceSetRestriction: SourceSetData?
+    ) = if (node.ordered) ol { buildListItems(node.children, pageContext, sourceSetRestriction) }
+    else ul { buildListItems(node.children, pageContext, sourceSetRestriction) }
 
     open fun OL.buildListItems(
         items: List<ContentNode>,
         pageContext: ContentPage,
-        platformRestriction: PlatformData? = null
+        sourceSetRestriction: SourceSetData? = null
     ) {
         items.forEach {
             if (it is ContentList)
                 buildList(it, pageContext)
             else
-                li { it.build(this, pageContext, platformRestriction) }
+                li { it.build(this, pageContext, sourceSetRestriction) }
         }
     }
 
     open fun UL.buildListItems(
         items: List<ContentNode>,
         pageContext: ContentPage,
-        platformRestriction: PlatformData? = null
+        sourceSetRestriction: SourceSetData? = null
     ) {
         items.forEach {
             if (it is ContentList)
@@ -118,64 +119,63 @@ open class HtmlRenderer(
     private fun FlowContent.buildRow(
         node: ContentGroup,
         pageContext: ContentPage,
-        platformRestriction: PlatformData?
+        sourceSetRestriction: SourceSetData?
     ) {
         node.children
             .filter {
-                platformRestriction == null || platformRestriction in it.platforms
+                sourceSetRestriction == null || sourceSetRestriction in it.sourceSets
             }
             .takeIf { it.isNotEmpty() }
             ?.let {
                 div(classes = "table-row") {
                     it.filter { it.dci.kind != ContentKind.Symbol }.takeIf { it.isNotEmpty() }?.let {
                         div("main-subrow ${node.style.joinToString { it.toString().decapitalize() }}") {
-                            it.filter { platformRestriction == null || platformRestriction in it.platforms }
+                            it.filter { sourceSetRestriction == null || sourceSetRestriction in it.sourceSets }
                                 .forEach {
                                     when(it.dci.kind){
-                                        ContentKind.PlatformDependantHint -> {
+                                        ContentKind.SourceSetDependantHint -> {
                                             div("platform-dependant-row keyValue"){
                                                 div()
                                                 div("title"){
-                                                    it.build(this, pageContext, platformRestriction)
+                                                    it.build(this, pageContext, sourceSetRestriction)
                                                 }
                                             }
                                         }
                                         ContentKind.Main -> {
                                             div("title-row"){
-                                                it.build(this, pageContext, platformRestriction)
+                                                it.build(this, pageContext, sourceSetRestriction)
                                                 div()
-                                                if (ContentKind.shouldBePlatformTagged(node.dci.kind) && node.platforms.size == 1) {
+                                                if (ContentKind.shouldBePlatformTagged(node.dci.kind) && node.sourceSets.size == 1) {
                                                     createPlatformTags(node)
                                                 } else {
                                                     div()
                                                 }
                                             }
                                         }
-                                        else -> div { it.build(this, pageContext, platformRestriction) }
+                                        else -> div { it.build(this, pageContext, sourceSetRestriction) }
                                     }
                                 }
                         }
                     }
                     it.filter { it.dci.kind == ContentKind.Symbol }.takeIf { it.isNotEmpty() }?.let {
                         div("signature-subrow") {
-                            div("signatures"){
+                            div("signatures") {
                                 it.forEach {
-                                    it.build(this, pageContext, platformRestriction)
+                                    it.build(this, pageContext, sourceSetRestriction)
                                 }
                             }
                         }
                     }
                 }
-        }
+            }
     }
 
-    private fun FlowContent.createPlatformTags( node: ContentNode ) {
+    private fun FlowContent.createPlatformTags(node: ContentNode) {
         div("platform-tags") {
-            node.platforms.forEach {
+            node.sourceSets.forEach {
                 div("platform-tag") {
-                    val targets = it.targets.joinToString(", ")
-                    if( targets.equals("common", ignoreCase = true) ) classes = classes + "common"
-                    text(it.targets.joinToString(", "))
+                    if (it.sourceSetName.equals("common", ignoreCase = true)) classes = classes + "common"
+                    text(it.sourceSetName)
                 }
             }
         }
@@ -184,11 +184,11 @@ open class HtmlRenderer(
     override fun FlowContent.buildTable(
         node: ContentTable,
         pageContext: ContentPage,
-        platformRestriction: PlatformData?
+        sourceSetRestriction: SourceSetData?
     ) {
         div(classes = "table") {
             node.children.forEach {
-                buildRow(it, pageContext, platformRestriction)
+                buildRow(it, pageContext, sourceSetRestriction)
             }
         }
     }
@@ -221,7 +221,7 @@ open class HtmlRenderer(
 
     fun FlowContent.buildLink(
         to: DRI,
-        platforms: List<PlatformData>,
+        platforms: List<SourceSetData>,
         from: PageNode? = null,
         block: FlowContent.() -> Unit
     ) = buildLink(locationProvider.resolve(to, platforms, from), block)
diff --git a/plugins/base/src/main/kotlin/renderers/html/NavigationPage.kt b/plugins/base/src/main/kotlin/renderers/html/NavigationPage.kt
index 4b90cc8a..4048c11e 100644
--- a/plugins/base/src/main/kotlin/renderers/html/NavigationPage.kt
+++ b/plugins/base/src/main/kotlin/renderers/html/NavigationPage.kt
@@ -3,8 +3,8 @@ package org.jetbrains.dokka.base.renderers.html
 import kotlinx.html.*
 import kotlinx.html.stream.createHTML
 import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.pages.PageNode
-import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.pages.RendererSpecificPage
 import org.jetbrains.dokka.pages.RenderingStrategy
 
@@ -41,7 +41,7 @@ class NavigationPage(val root: NavigationNode) : RendererSpecificPage {
 class NavigationNode(
     val name: String,
     val dri: DRI,
-    val platforms: List<PlatformData>,
+    val platforms: List<SourceSetData>,
     val children: List<NavigationNode>
 )
 
diff --git a/plugins/base/src/main/kotlin/resolvers/local/DefaultLocationProvider.kt b/plugins/base/src/main/kotlin/resolvers/local/DefaultLocationProvider.kt
index 29c4a425..322f4927 100644
--- a/plugins/base/src/main/kotlin/resolvers/local/DefaultLocationProvider.kt
+++ b/plugins/base/src/main/kotlin/resolvers/local/DefaultLocationProvider.kt
@@ -4,6 +4,8 @@ import org.jetbrains.dokka.DokkaConfiguration
 import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.resolvers.external.ExternalLocationProvider
 import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.model.SourceSetData
+import org.jetbrains.dokka.model.sourceSet
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.plugin
@@ -46,15 +48,14 @@ open class DefaultLocationProvider(
     override fun resolve(node: PageNode, context: PageNode?, skipExtension: Boolean): String =
         pathTo(node, context) + if (!skipExtension) extension else ""
 
-    override fun resolve(dri: DRI, platforms: List<PlatformData>, context: PageNode?): String =
+    override fun resolve(dri: DRI, sourceSets: List<SourceSetData>, context: PageNode?): String =
         pagesIndex[dri]?.let { resolve(it, context) } ?:
         // Not found in PageGraph, that means it's an external link
         getLocation(dri,
             this.dokkaContext.configuration.passesConfigurations
                 .filter { passConfig ->
-                    platforms.toSet()
-                        .contains(PlatformData(passConfig.moduleName, passConfig.analysisPlatform, passConfig.targets))
-                } // TODO: change targets to something better?
+                    sourceSets.toSet().contains(dokkaContext.sourceSet(passConfig))
+                }
                 .groupBy({ it.jdkVersion }, { it.externalDocumentationLinks })
                 .map { it.key to it.value.flatten().distinct() }.toMap()
         )
diff --git a/plugins/base/src/main/kotlin/resolvers/local/LocationProvider.kt b/plugins/base/src/main/kotlin/resolvers/local/LocationProvider.kt
index 0814cb3e..c6c48d63 100644
--- a/plugins/base/src/main/kotlin/resolvers/local/LocationProvider.kt
+++ b/plugins/base/src/main/kotlin/resolvers/local/LocationProvider.kt
@@ -1,12 +1,12 @@
 package org.jetbrains.dokka.base.resolvers.local
 
 import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.pages.PageNode
-import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.pages.RootPageNode
 
 interface LocationProvider {
-    fun resolve(dri: DRI, platforms: List<PlatformData>, context: PageNode? = null): String
+    fun resolve(dri: DRI, sourceSets: List<SourceSetData>, context: PageNode? = null): String
     fun resolve(node: PageNode, context: PageNode? = null, skipExtension: Boolean = false): String
     fun resolveRoot(node: PageNode): String
     fun ancestors(node: PageNode): List<PageNode>
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
index 313973bf..241103bf 100644
--- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
+++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
@@ -10,7 +10,6 @@ import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.properties.WithExtraProperties
 import org.jetbrains.dokka.pages.ContentKind
 import org.jetbrains.dokka.pages.ContentNode
-import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.pages.TextStyle
 import org.jetbrains.dokka.utilities.DokkaLogger
 
@@ -35,7 +34,7 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
         link(e.name, e.dri)
     }
 
-    private fun actualTypealiasedSignature(dri: DRI, name: String, aliasedTypes: PlatformDependent<Bound>) =
+    private fun actualTypealiasedSignature(dri: DRI, name: String, aliasedTypes: SourceSetDependent<Bound>) =
         aliasedTypes.entries.groupBy({ it.value }, { it.key }).map { (bound, platforms) ->
             contentBuilder.contentFor(dri, platforms.toSet(), ContentKind.Symbol, setOf(TextStyle.Monospace)) {
                 text("actual typealias ")
@@ -49,17 +48,17 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
         (c as? WithExtraProperties<out DClasslike>)?.let {
             c.extra[ActualTypealias]?.let {
                 contentBuilder.contentFor(c) {
-                    +regularSignature(c, platformData = c.platformData.toSet() - it.underlyingType.keys)
+                    +regularSignature(c, sourceSets = c.sourceSets.toSet() - it.underlyingType.keys)
                     +actualTypealiasedSignature(c.dri, c.name.orEmpty(), it.underlyingType)
                 }
             } ?: regularSignature(c)
         } ?: regularSignature(c)
 
-    private fun regularSignature(c: DClasslike, platformData: Set<PlatformData> = c.platformData.toSet()) =
-        contentBuilder.contentFor(c, ContentKind.Symbol, setOf(TextStyle.Monospace), platformData = platformData) {
-            platformText(c.visibility, platformData) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
+    private fun regularSignature(c: DClasslike, sourceSets: Set<SourceSetData> = c.sourceSets.toSet()) =
+        contentBuilder.contentFor(c, ContentKind.Symbol, setOf(TextStyle.Monospace), sourceSets = sourceSets) {
+            platformText(c.visibility, sourceSets) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
             if (c is DClass) {
-                platformText(c.modifier, platformData) {
+                platformText(c.modifier, sourceSets) {
                     if (c.extra[AdditionalModifiers]?.content?.contains(ExtraModifiers.DATA) == true && it.name == "final") "data "
                     else it.name + " "
                 }
@@ -74,23 +73,23 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
             link(c.name!!, c.dri)
             if (c is DClass) {
                 val pConstructor = c.constructors.singleOrNull { it.extra[PrimaryConstructorExtra] != null }
-                list(pConstructor?.parameters.orEmpty(), "(", ")", ",", pConstructor?.platformData.orEmpty().toSet()) {
+                list(pConstructor?.parameters.orEmpty(), "(", ")", ",", pConstructor?.sourceSets.orEmpty().toSet()) {
                     text(it.name ?: "", styles = mainStyles.plus(TextStyle.Bold).plus(TextStyle.Indented))
                     text(": ")
                     signatureForProjection(it.type)
                 }
             }
             if (c is WithSupertypes) {
-                c.supertypes.filter { it.key in platformData }.map { (p, dris) ->
-                    list(dris, prefix = " : ", platformData = setOf(p)) {
-                        link(it.sureClassNames, it, platformData = setOf(p))
+                c.supertypes.filter { it.key in sourceSets }.map { (p, dris) ->
+                    list(dris, prefix = " : ", sourceSets = setOf(p)) {
+                        link(it.sureClassNames, it, sourceSets = setOf(p))
                     }
                 }
             }
         }
 
-    private fun propertySignature(p: DProperty, platformData: Set<PlatformData> = p.platformData.toSet()) =
-        contentBuilder.contentFor(p, ContentKind.Symbol, setOf(TextStyle.Monospace), platformData = platformData) {
+    private fun propertySignature(p: DProperty, sourceSets: Set<SourceSetData> = p.sourceSets.toSet()) =
+        contentBuilder.contentFor(p, ContentKind.Symbol, setOf(TextStyle.Monospace), sourceSets = sourceSets) {
             platformText(p.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
             platformText(p.modifier){ it.name + " "}
             p.setter?.let { text("var ") } ?: text("val ")
@@ -106,8 +105,8 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
             signatureForProjection(p.type)
         }
 
-    private fun functionSignature(f: DFunction, platformData: Set<PlatformData> = f.platformData.toSet()) =
-        contentBuilder.contentFor(f, ContentKind.Symbol, setOf(TextStyle.Monospace), platformData = platformData) {
+    private fun functionSignature(f: DFunction, sourceSets: Set<SourceSetData> = f.sourceSets.toSet()) =
+        contentBuilder.contentFor(f, ContentKind.Symbol, setOf(TextStyle.Monospace), sourceSets = sourceSets) {
             platformText(f.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
             platformText(f.modifier) { it.name + " " }
             text("fun ")
@@ -147,7 +146,7 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
                     t,
                     ContentKind.Symbol,
                     setOf(TextStyle.Monospace),
-                    platformData = platforms.toSet()
+                    sourceSets = platforms.toSet()
                 ) {
                     platformText(t.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
                     text("typealias ")
@@ -196,8 +195,8 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
             is PrimitiveJavaType -> signatureForProjection(p.translateToKotlin())
         }
 
-    private fun funType(dri: DRI, platformData: Set<PlatformData>, type: TypeConstructor) =
-        contentBuilder.contentFor(dri, platformData, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
+    private fun funType(dri: DRI, sourceSets: Set<SourceSetData>, type: TypeConstructor) =
+        contentBuilder.contentFor(dri, sourceSets, ContentKind.Symbol, setOf(TextStyle.Monospace)) {
             if (type.extension) {
                 signatureForProjection(type.projections.first())
                 text(".")
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/ActualTypealiasAdder.kt b/plugins/base/src/main/kotlin/transformers/documentables/ActualTypealiasAdder.kt
index 35f27a94..cab4a9d2 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/ActualTypealiasAdder.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/ActualTypealiasAdder.kt
@@ -6,8 +6,8 @@ import org.jetbrains.dokka.model.properties.WithExtraProperties
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.transformers.documentation.PreMergeDocumentableTransformer
 
-class ActualTypealiasAdder : PreMergeDocumentableTransformer {
-    override fun invoke(modules: List<DModule>, context: DokkaContext) = modules.map { it.mergeTypealiases() }
+class ActualTypealiasAdder(val context: DokkaContext) : PreMergeDocumentableTransformer {
+    override fun invoke(modules: List<DModule>) = modules.map { it.mergeTypealiases() }
 
     private fun DModule.mergeTypealiases(): DModule = copy(packages = packages.map { pkg ->
         if (pkg.typealiases.isEmpty()) {
@@ -64,11 +64,11 @@ class ActualTypealiasAdder : PreMergeDocumentableTransformer {
         typealiases: Map<DRI, DTypeAlias>
     ): List<T> where T : DClasslike, T : WithExtraProperties<T>, T : WithExpectActual =
         elements.map { element ->
-            if (element.sources.expect != null) {
+            if (element.expectPresentInSet != null) {
                 typealiases[element.dri]?.let { ta ->
                     element.withNewExtras(
                         element.extra + ActualTypealias(
-                            PlatformDependent.from(ta.platformData.single(), ta.underlyingType.values.single())
+                            mapOf(ta.sourceSets.single() to ta.underlyingType.values.single())
                         )
                     )
                 } ?: element
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
index f871cdec..862f9240 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
@@ -2,7 +2,6 @@ package org.jetbrains.dokka.base.transformers.documentables
 
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.properties.mergeExtras
-import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.transformers.documentation.DocumentableMerger
 import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
@@ -24,8 +23,9 @@ internal object DefaultDocumentableMerger : DocumentableMerger {
                     list.flatMap { it.packages },
                     DPackage::mergeWith
                 ),
-                documentation = list.platformDependentFor { documentation },
-                platformData = list.flatMap { it.platformData }.distinct()
+                documentation = list.map { it.documentation }.flatMap { it.entries }.associate { (k,v) -> k to v },
+                expectPresentInSet = list.firstNotNullResult { it.expectPresentInSet },
+                sourceSets = list.flatMap { it.sourceSets }
             ).mergeExtras(left, right)
         }
     }
@@ -36,115 +36,51 @@ private fun <T : Documentable> merge(elements: List<T>, reducer: (T, T) -> T): L
         .reduce { _, left, right -> reducer(left, right) }
         .values.toList()
 
-private fun <T : Any, D : Documentable> Iterable<D>.platformDependentFor(
-    selector: D.() -> PlatformDependent<T>
-): PlatformDependent<T> {
-    val actuals = map { it.selector().map }
-        .flatMap { it.entries }
-        .associate { (k, v) -> k to v }
-
-    val expected = firstNotNullResult { it.selector().expect }
-
-    return PlatformDependent(actuals, expected)
-}
-
-private fun <T : Any> PlatformDependent<T>.mergeWith(other: PlatformDependent<T>) = PlatformDependent(
-    map = this + other,
-    expect = expect ?: other.expect
-)
-
 private fun <T> mergeExpectActual(
     elements: List<T>,
-    reducer: (T, T) -> T,
-    platformSetter: T.(List<PlatformData>) -> T
+    reducer: (T, T) -> T
 ): List<T> where T : Documentable, T : WithExpectActual {
 
-    fun findExpect(actual: T, expects: List<T>): Expect<T> =
-        expects.find { it.platformData.flatMap { it.targets }.containsAll(actual.platformData.flatMap { it.targets }) }
-            .let { Expect.from(it) }
-
-    fun reduceExpectActual(entry: Map.Entry<Expect<T>, List<T>>): List<T> = when (val expect = entry.key) {
-        Expect.NotFound -> entry.value
-        is Expect.Found -> entry.value.plus(expect.expect).reduce(reducer).let(::listOf)
-    }
-
-    fun analyzeExpectActual(sameDriElements: List<T>): List<T> {
-        val pathGrouped: Collection<T> = mutableMapOf<Set<String>, T>().apply {
-            sameDriElements.forEach { documentable ->
-                val paths = documentable.sources.allValues.map { it.path }.toSet()
-                val key = keys.find { it.containsAll(paths) }
-                if (key == null) {
-                    put(paths, documentable)
-                } else {
-                    computeIfPresent(key) { _, old -> reducer(old, documentable) }
-                }
-            }
-        }.values
-        val (expect, actual) = pathGrouped.partition { it.sources.expect != null }
-        val mergedExpect = expect.groupBy { it.sources.expect?.path }.values.map { e ->
-            e.first().platformSetter(e.flatMap { it.platformData }.distinct())
-        }
-        val groupExpectActual = actual.groupBy { findExpect(it, mergedExpect) }
-        val pathsToExpects: Set<String> =
-            groupExpectActual.keys.filterIsInstance<Expect.Found<T>>()
-                .mapNotNull { it.expect.sources.expect?.path }.toSet()
+    fun analyzeExpectActual(sameDriElements: List<T>) = sameDriElements.reduce(reducer)
 
-        return groupExpectActual.flatMap { reduceExpectActual(it) } + expect.filterNot { it.sources.expect?.path in pathsToExpects }
-    }
-
-    return elements.groupBy { it.dri }.values.flatMap(::analyzeExpectActual)
-}
-
-private sealed class Expect<out T : Any> {
-    object NotFound : Expect<Nothing>()
-    data class Found<T : Any>(val expect: T) : Expect<T>()
-
-    companion object {
-        fun <T : Any> from(t: T?) = t?.let(::Found) ?: NotFound
-    }
+    return elements.groupBy { it.dri }.values.map(::analyzeExpectActual)
 }
 
 fun DPackage.mergeWith(other: DPackage): DPackage = copy(
-    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith) { copy(platformData = it) },
-    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith) { copy(platformData = it) },
-    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith, DClasslike::setPlatformData),
-    documentation = documentation.mergeWith(other.documentation),
+    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith),
+    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith),
+    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith),
+    documentation = documentation + other.documentation,
+    expectPresentInSet = expectPresentInSet ?: other.expectPresentInSet,
     typealiases = merge(typealiases + other.typealiases, DTypeAlias::mergeWith),
-    platformData = (platformData + other.platformData).distinct()
+    sourceSets = sourceSets + other.sourceSets
 ).mergeExtras(this, other)
 
 fun DFunction.mergeWith(other: DFunction): DFunction = copy(
     parameters = merge(this.parameters + other.parameters, DParameter::mergeWith),
     receiver = receiver?.let { r -> other.receiver?.let { r.mergeWith(it) } ?: r } ?: other.receiver,
-    documentation = documentation.mergeWith(other.documentation),
-    sources = sources.mergeWith(other.sources),
-    visibility = visibility.mergeWith(other.visibility),
-    modifier = modifier.mergeWith(other.modifier),
-    platformData = (platformData + other.platformData).distinct(),
+    documentation = documentation + other.documentation,
+    expectPresentInSet = expectPresentInSet ?: other.expectPresentInSet,
+    sources = sources+ other.sources,
+    visibility = visibility + other.visibility,
+    modifier = modifier + other.modifier,
+    sourceSets = sourceSets + other.sourceSets,
     generics = merge(generics + other.generics, DTypeParameter::mergeWith)
 ).mergeExtras(this, other)
 
 fun DProperty.mergeWith(other: DProperty): DProperty = copy(
     receiver = receiver?.let { r -> other.receiver?.let { r.mergeWith(it) } ?: r } ?: other.receiver,
-    documentation = documentation.mergeWith(other.documentation),
-    sources = sources.mergeWith(other.sources),
-    visibility = visibility.mergeWith(other.visibility),
-    modifier = modifier.mergeWith(other.modifier),
-    platformData = (platformData + other.platformData).distinct(),
+    documentation = documentation + other.documentation,
+    expectPresentInSet = expectPresentInSet ?: other.expectPresentInSet,
+    sources = sources+ other.sources,
+    visibility = visibility + other.visibility,
+    modifier = modifier + other.modifier,
+    sourceSets = sourceSets + other.sourceSets,
     getter = getter?.let { g -> other.getter?.let { g.mergeWith(it) } ?: g } ?: other.getter,
     setter = setter?.let { s -> other.setter?.let { s.mergeWith(it) } ?: s } ?: other.setter,
     generics = merge(generics + other.generics, DTypeParameter::mergeWith)
 ).mergeExtras(this, other)
 
-fun DClasslike.setPlatformData(platformData: List<PlatformData>): DClasslike = when (this) {
-    is DClass -> copy(platformData = platformData)
-    is DEnum -> copy(platformData = platformData)
-    is DInterface -> copy(platformData = platformData)
-    is DObject -> copy(platformData = platformData)
-    is DAnnotation -> copy(platformData = platformData)
-    else -> throw IllegalStateException("${this::class.qualifiedName} ${this.name} cannot have platform set")
-}
-
 fun DClasslike.mergeWith(other: DClasslike): DClasslike = when {
     this is DClass && other is DClass -> mergeWith(other)
     this is DEnum && other is DEnum -> mergeWith(other)
@@ -158,18 +94,19 @@ fun DClass.mergeWith(other: DClass): DClass = copy(
     constructors = mergeExpectActual(
         constructors + other.constructors,
         DFunction::mergeWith
-    ) { copy(platformData = it) },
-    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith) { copy(platformData = it) },
-    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith) { copy(platformData = it) },
-    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith, DClasslike::setPlatformData),
+    ),
+    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith),
+    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith),
+    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith),
     companion = companion?.let { c -> other.companion?.let { c.mergeWith(it) } ?: c } ?: other.companion,
     generics = merge(generics + other.generics, DTypeParameter::mergeWith),
-    modifier = modifier.mergeWith(other.modifier),
-    supertypes = supertypes.mergeWith(other.supertypes),
-    documentation = documentation.mergeWith(other.documentation),
-    sources = sources.mergeWith(other.sources),
-    visibility = visibility.mergeWith(other.visibility),
-    platformData = (platformData + other.platformData).distinct()
+    modifier = modifier + other.modifier,
+    supertypes = supertypes + other.supertypes,
+    documentation = documentation + other.documentation,
+    expectPresentInSet = expectPresentInSet ?: other.expectPresentInSet,
+    sources = sources+ other.sources,
+    visibility = visibility + other.visibility,
+    sourceSets = sourceSets + other.sourceSets
 ).mergeExtras(this, other)
 
 fun DEnum.mergeWith(other: DEnum): DEnum = copy(
@@ -177,78 +114,86 @@ fun DEnum.mergeWith(other: DEnum): DEnum = copy(
     constructors = mergeExpectActual(
         constructors + other.constructors,
         DFunction::mergeWith
-    ) { copy(platformData = it) },
-    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith) { copy(platformData = it) },
-    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith) { copy(platformData = it) },
-    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith, DClasslike::setPlatformData),
+    ),
+    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith),
+    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith),
+    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith),
     companion = companion?.let { c -> other.companion?.let { c.mergeWith(it) } ?: c } ?: other.companion,
-    supertypes = supertypes.mergeWith(other.supertypes),
-    documentation = documentation.mergeWith(other.documentation),
-    sources = sources.mergeWith(other.sources),
-    visibility = visibility.mergeWith(other.visibility),
-    platformData = (platformData + other.platformData).distinct()
+    supertypes = supertypes + other.supertypes,
+    documentation = documentation + other.documentation,
+    expectPresentInSet = expectPresentInSet ?: other.expectPresentInSet,
+    sources = sources+ other.sources,
+    visibility = visibility + other.visibility,
+    sourceSets = sourceSets + other.sourceSets
 ).mergeExtras(this, other)
 
 fun DEnumEntry.mergeWith(other: DEnumEntry): DEnumEntry = copy(
-    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith) { copy(platformData = it) },
-    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith) { copy(platformData = it) },
-    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith, DClasslike::setPlatformData),
-    documentation = documentation.mergeWith(other.documentation),
-    platformData = (platformData + other.platformData).distinct()
+    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith),
+    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith),
+    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith),
+    documentation = documentation + other.documentation,
+    expectPresentInSet = expectPresentInSet ?: other.expectPresentInSet,
+    sourceSets = sourceSets + other.sourceSets
 ).mergeExtras(this, other)
 
 fun DObject.mergeWith(other: DObject): DObject = copy(
-    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith) { copy(platformData = it) },
-    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith) { copy(platformData = it) },
-    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith, DClasslike::setPlatformData),
-    supertypes = supertypes.mergeWith(other.supertypes),
-    documentation = documentation.mergeWith(other.documentation),
-    sources = sources.mergeWith(other.sources),
-    visibility = visibility.mergeWith(other.visibility),
-    platformData = (platformData + other.platformData).distinct()
+    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith),
+    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith),
+    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith),
+    supertypes = supertypes + other.supertypes,
+    documentation = documentation + other.documentation,
+    expectPresentInSet = expectPresentInSet ?: other.expectPresentInSet,
+    sources = sources+ other.sources,
+    visibility = visibility + other.visibility,
+    sourceSets = sourceSets + other.sourceSets
 ).mergeExtras(this, other)
 
 fun DInterface.mergeWith(other: DInterface): DInterface = copy(
-    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith) { copy(platformData = it) },
-    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith) { copy(platformData = it) },
-    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith, DClasslike::setPlatformData),
+    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith),
+    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith),
+    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith),
     companion = companion?.let { c -> other.companion?.let { c.mergeWith(it) } ?: c } ?: other.companion,
     generics = merge(generics + other.generics, DTypeParameter::mergeWith),
-    supertypes = supertypes.mergeWith(other.supertypes),
-    documentation = documentation.mergeWith(other.documentation),
-    sources = sources.mergeWith(other.sources),
-    visibility = visibility.mergeWith(other.visibility),
-    platformData = (platformData + other.platformData).distinct()
+    supertypes = supertypes + other.supertypes,
+    documentation = documentation + other.documentation,
+    expectPresentInSet = expectPresentInSet ?: other.expectPresentInSet,
+    sources = sources+ other.sources,
+    visibility = visibility + other.visibility,
+    sourceSets = sourceSets + other.sourceSets
 ).mergeExtras(this, other)
 
 fun DAnnotation.mergeWith(other: DAnnotation): DAnnotation = copy(
     constructors = mergeExpectActual(
         constructors + other.constructors,
         DFunction::mergeWith
-    ) { copy(platformData = it) },
-    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith) { copy(platformData = it) },
-    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith) { copy(platformData = it) },
-    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith, DClasslike::setPlatformData),
+    ),
+    functions = mergeExpectActual(functions + other.functions, DFunction::mergeWith),
+    properties = mergeExpectActual(properties + other.properties, DProperty::mergeWith),
+    classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith),
     companion = companion?.let { c -> other.companion?.let { c.mergeWith(it) } ?: c } ?: other.companion,
-    documentation = documentation.mergeWith(other.documentation),
-    sources = sources.mergeWith(other.sources),
-    visibility = visibility.mergeWith(other.visibility),
-    platformData = (platformData + other.platformData).distinct()
+    documentation = documentation + other.documentation,
+    expectPresentInSet = expectPresentInSet ?: other.expectPresentInSet,
+    sources = sources+ other.sources,
+    visibility = visibility + other.visibility,
+    sourceSets = sourceSets + other.sourceSets
 ).mergeExtras(this, other)
 
 fun DParameter.mergeWith(other: DParameter): DParameter = copy(
-    documentation = documentation.mergeWith(other.documentation),
-    platformData = (platformData + other.platformData).distinct()
+    documentation = documentation + other.documentation,
+    expectPresentInSet = expectPresentInSet ?: other.expectPresentInSet,
+    sourceSets = sourceSets + other.sourceSets
 ).mergeExtras(this, other)
 
 fun DTypeParameter.mergeWith(other: DTypeParameter): DTypeParameter = copy(
-    documentation = documentation.mergeWith(other.documentation),
-    platformData = (platformData + other.platformData).distinct()
+    documentation = documentation + other.documentation,
+    expectPresentInSet = expectPresentInSet ?: other.expectPresentInSet,
+    sourceSets = sourceSets + other.sourceSets
 ).mergeExtras(this, other)
 
 fun DTypeAlias.mergeWith(other: DTypeAlias): DTypeAlias = copy(
-    documentation = documentation.mergeWith(other.documentation),
-    underlyingType = underlyingType.mergeWith(other.underlyingType),
-    visibility = visibility.mergeWith(other.visibility),
-    platformData = (platformData + other.platformData).distinct()
+    documentation = documentation + other.documentation,
+    expectPresentInSet = expectPresentInSet ?: other.expectPresentInSet,
+    underlyingType = underlyingType + other.underlyingType,
+    visibility = visibility + other.visibility,
+    sourceSets = sourceSets + other.sourceSets
 ).mergeExtras(this, other)
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt b/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt
index c261d2dc..6fdce3a8 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt
@@ -5,15 +5,14 @@ import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.DAnnotation
 import org.jetbrains.dokka.model.DEnum
 import org.jetbrains.dokka.model.DFunction
-import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.transformers.documentation.PreMergeDocumentableTransformer
 
-internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
+internal class DocumentableVisibilityFilter(val context: DokkaContext) : PreMergeDocumentableTransformer {
 
-    override fun invoke(modules: List<DModule>, context: DokkaContext): List<DModule> = modules.map { original ->
+    override fun invoke(modules: List<DModule>): List<DModule> = modules.map { original ->
         val packageOptions =
-            context.configuration.passesConfigurations.first { original.platformData.contains(it.platformData) }
+            context.configuration.passesConfigurations.first { original.sourceSets.contains(context.sourceSet(it)) }
                 .perPackageOptions
 
         DocumentableFilter(packageOptions).processModule(original)
@@ -36,7 +35,7 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
                         original.name,
                         packages = packages,
                         documentation = original.documentation,
-                        platformData = original.platformData,
+                        sourceSets = original.sourceSets,
                         extra = original.extra
                     )
             }
@@ -69,7 +68,8 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
                             classlikes,
                             it.typealiases,
                             it.documentation,
-                            it.platformData,
+                            it.expectPresentInSet,
+                            it.sourceSets,
                             it.extra
                         )
                     }
@@ -78,26 +78,25 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
             return Pair(packagesListChanged, filteredPackages)
         }
 
-        private fun <T : WithVisibility> alwaysTrue(a: T, p: PlatformData) = true
-        private fun <T : WithVisibility> alwaysFalse(a: T, p: PlatformData) = false
+        private fun <T : WithVisibility> alwaysTrue(a: T, p: SourceSetData) = true
+        private fun <T : WithVisibility> alwaysFalse(a: T, p: SourceSetData) = false
 
-        private fun WithVisibility.visibilityForPlatform(data: PlatformData): Visibility? =
-            visibility[data] ?: visibility.expect
+        private fun WithVisibility.visibilityForPlatform(data: SourceSetData): Visibility? = visibility[data]
 
         private fun <T> T.filterPlatforms(
-            additionalCondition: (T, PlatformData) -> Boolean = ::alwaysTrue,
-            alternativeCondition: (T, PlatformData) -> Boolean = ::alwaysFalse
+            additionalCondition: (T, SourceSetData) -> Boolean = ::alwaysTrue,
+            alternativeCondition: (T, SourceSetData) -> Boolean = ::alwaysFalse
         ) where T : Documentable, T : WithVisibility =
-            platformData.filter { d ->
+            sourceSets.filter { d ->
                 visibilityForPlatform(d)?.isAllowedInPackage(dri.packageName) == true &&
                         additionalCondition(this, d) ||
                         alternativeCondition(this, d)
             }
 
         private fun <T> List<T>.transform(
-            additionalCondition: (T, PlatformData) -> Boolean = ::alwaysTrue,
-            alternativeCondition: (T, PlatformData) -> Boolean = ::alwaysFalse,
-            recreate: (T, List<PlatformData>) -> T
+            additionalCondition: (T, SourceSetData) -> Boolean = ::alwaysTrue,
+            alternativeCondition: (T, SourceSetData) -> Boolean = ::alwaysFalse,
+            recreate: (T, List<SourceSetData>) -> T
         ): Pair<Boolean, List<T>> where T : Documentable, T : WithVisibility {
             var changed = false
             val values = mapNotNull { t ->
@@ -119,7 +118,7 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
 
         private fun filterFunctions(
             functions: List<DFunction>,
-            additionalCondition: (DFunction, PlatformData) -> Boolean = ::alwaysTrue
+            additionalCondition: (DFunction, SourceSetData) -> Boolean = ::alwaysTrue
         ) =
             functions.transform(additionalCondition) { original, filteredPlatforms ->
                 with(original) {
@@ -129,6 +128,7 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
                         isConstructor,
                         parameters,
                         documentation.filtered(filteredPlatforms),
+                        expectPresentInSet.filtered(filteredPlatforms),
                         sources.filtered(filteredPlatforms),
                         visibility.filtered(filteredPlatforms),
                         type,
@@ -141,13 +141,13 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
                 }
             }
 
-        private fun hasVisibleAccessorsForPlatform(property: DProperty, data: PlatformData) =
+        private fun hasVisibleAccessorsForPlatform(property: DProperty, data: SourceSetData) =
             property.getter?.visibilityForPlatform(data)?.isAllowedInPackage(property.dri.packageName) == true ||
                     property.setter?.visibilityForPlatform(data)?.isAllowedInPackage(property.dri.packageName) == true
 
         private fun filterProperties(
             properties: List<DProperty>,
-            additionalCondition: (DProperty, PlatformData) -> Boolean = ::alwaysTrue
+            additionalCondition: (DProperty, SourceSetData) -> Boolean = ::alwaysTrue
         ): Pair<Boolean, List<DProperty>> =
             properties.transform(additionalCondition, ::hasVisibleAccessorsForPlatform) { original, filteredPlatforms ->
                 with(original) {
@@ -155,6 +155,7 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
                         dri,
                         name,
                         documentation.filtered(filteredPlatforms),
+                        expectPresentInSet.filtered(filteredPlatforms),
                         sources.filtered(filteredPlatforms),
                         visibility.filtered(filteredPlatforms),
                         type,
@@ -169,16 +170,17 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
                 }
             }
 
-        private fun filterEnumEntries(entries: List<DEnumEntry>, filteredPlatforms: List<PlatformData>) =
+        private fun filterEnumEntries(entries: List<DEnumEntry>, filteredPlatforms: List<SourceSetData>) =
             entries.mapNotNull { entry ->
-                if (filteredPlatforms.containsAll(entry.platformData)) entry
+                if (filteredPlatforms.containsAll(entry.sourceSets)) entry
                 else {
-                    val intersection = filteredPlatforms.intersect(entry.platformData).toList()
+                    val intersection = filteredPlatforms.intersect(entry.sourceSets).toList()
                     if (intersection.isEmpty()) null
                     else DEnumEntry(
                         entry.dri,
                         entry.name,
                         entry.documentation.filtered(intersection),
+                        entry.expectPresentInSet.filtered(filteredPlatforms),
                         filterFunctions(entry.functions) { _, data -> data in intersection }.second,
                         filterProperties(entry.properties) { _, data -> data in intersection }.second,
                         filterClasslikes(entry.classlikes) { _, data -> data in intersection }.second,
@@ -190,7 +192,7 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
 
         private fun filterClasslikes(
             classlikeList: List<DClasslike>,
-            additionalCondition: (DClasslike, PlatformData) -> Boolean = ::alwaysTrue
+            additionalCondition: (DClasslike, SourceSetData) -> Boolean = ::alwaysTrue
         ): Pair<Boolean, List<DClasslike>> {
             var classlikesListChanged = false
             val filteredClasslikes: List<DClasslike> = classlikeList.mapNotNull {
@@ -200,7 +202,7 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
                         classlikesListChanged = true
                         null
                     } else {
-                        var modified = platformData.size != filteredPlatforms.size
+                        var modified = sourceSets.size != filteredPlatforms.size
                         val functions =
                             filterFunctions(functions) { _, data -> data in filteredPlatforms }.let { (listModified, list) ->
                                 modified = modified || listModified
@@ -246,6 +248,7 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
                                 generics,
                                 supertypes.filtered(filteredPlatforms),
                                 documentation.filtered(filteredPlatforms),
+                                expectPresentInSet.filtered(filteredPlatforms),
                                 modifier,
                                 filteredPlatforms,
                                 extra
@@ -254,6 +257,7 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
                                 name,
                                 dri,
                                 documentation.filtered(filteredPlatforms),
+                                expectPresentInSet.filtered(filteredPlatforms),
                                 sources.filtered(filteredPlatforms),
                                 functions,
                                 properties,
@@ -269,6 +273,7 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
                                 name,
                                 enumEntries,
                                 documentation.filtered(filteredPlatforms),
+                                expectPresentInSet.filtered(filteredPlatforms),
                                 sources.filtered(filteredPlatforms),
                                 functions,
                                 properties,
@@ -284,6 +289,7 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
                                 dri,
                                 name,
                                 documentation.filtered(filteredPlatforms),
+                                expectPresentInSet.filtered(filteredPlatforms),
                                 sources.filtered(filteredPlatforms),
                                 functions,
                                 properties,
@@ -299,6 +305,7 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
                                 name,
                                 dri,
                                 documentation.filtered(filteredPlatforms),
+                                expectPresentInSet.filtered(filteredPlatforms),
                                 sources.filtered(filteredPlatforms),
                                 functions,
                                 properties,
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/InheritorsExtractorTransformer.kt b/plugins/base/src/main/kotlin/transformers/documentables/InheritorsExtractorTransformer.kt
index 9cc09d89..15ffc08a 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/InheritorsExtractorTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/InheritorsExtractorTransformer.kt
@@ -4,7 +4,6 @@ import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.properties.ExtraProperty
 import org.jetbrains.dokka.model.properties.MergeStrategy
-import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.transformers.documentation.DocumentableTransformer
 
@@ -12,8 +11,8 @@ class InheritorsExtractorTransformer : DocumentableTransformer {
     override fun invoke(original: DModule, context: DokkaContext): DModule =
         original.generateInheritanceMap().let { inheritanceMap -> original.appendInheritors(inheritanceMap) as DModule }
 
-    private fun <T : Documentable> T.appendInheritors(inheritanceMap: Map<PlatformData, Map<DRI, List<DRI>>>): Documentable =
-        InheritorsInfo(PlatformDependent(inheritanceMap.getForDRI(dri))).let { info ->
+    private fun <T : Documentable> T.appendInheritors(inheritanceMap: Map<SourceSetData, Map<DRI, List<DRI>>>): Documentable =
+        InheritorsInfo(inheritanceMap.getForDRI(dri)).let { info ->
             when (this) {
                 is DModule -> copy(packages = packages.map { it.appendInheritors(inheritanceMap) as DPackage })
                 is DPackage -> copy(classlikes = classlikes.map { it.appendInheritors(inheritanceMap) as DClasslike })
@@ -44,12 +43,12 @@ class InheritorsExtractorTransformer : DocumentableTransformer {
             }
         }
 
-    private fun InheritorsInfo.isNotEmpty() = this.value.allValues.fold(0) { acc, list -> acc + list.size } > 0
+    private fun InheritorsInfo.isNotEmpty() = this.value.values.fold(0) { acc, list -> acc + list.size } > 0
 
-    private fun Map<PlatformData, Map<DRI, List<DRI>>>.getForDRI(dri: DRI) =
-        PlatformDependent(map { (v, k) ->
+    private fun Map<SourceSetData, Map<DRI, List<DRI>>>.getForDRI(dri: DRI) =
+        map { (v, k) ->
             v to k[dri]
-        }.map { (k, v) -> k to v.orEmpty() }.toMap())
+        }.map { (k, v) -> k to v.orEmpty() }.toMap()
 
     private fun DModule.generateInheritanceMap() =
         getInheritanceEntriesRec().filterNot { it.second.isEmpty() }.groupBy({ it.first }) { it.second }
@@ -58,26 +57,24 @@ class InheritorsExtractorTransformer : DocumentableTransformer {
                     .groupBy({ it.first }) { it.second }.map { (k2, v2) -> k2 to v2.flatten() }.toMap()
             }.filter { it.second.values.isNotEmpty() }.toMap()
 
-    private fun <T : Documentable> T.getInheritanceEntriesRec(): List<Pair<PlatformData, List<Pair<DRI, DRI>>>> =
+    private fun <T : Documentable> T.getInheritanceEntriesRec(): List<Pair<SourceSetData, List<Pair<DRI, DRI>>>> =
         this.toInheritanceEntries() + children.flatMap { it.getInheritanceEntriesRec() }
 
     private fun <T : Documentable> T.toInheritanceEntries() =
         (this as? WithSupertypes)?.let {
-            it.supertypes.map.map { (k, v) -> k to v.map { it to dri } }
+            it.supertypes.map { (k, v) -> k to v.map { it to dri } }
         }.orEmpty()
 
 }
 
-class InheritorsInfo(val value: PlatformDependent<List<DRI>>) : ExtraProperty<Documentable> {
+class InheritorsInfo(val value: SourceSetDependent<List<DRI>>) : ExtraProperty<Documentable> {
     companion object : ExtraProperty.Key<Documentable, InheritorsInfo> {
         override fun mergeStrategyFor(left: InheritorsInfo, right: InheritorsInfo): MergeStrategy<Documentable> =
             MergeStrategy.Replace(
                 InheritorsInfo(
-                    PlatformDependent(
-                        (left.value.map.entries.toList() + right.value.map.entries.toList())
+                        (left.value.entries.toList() + right.value.entries.toList())
                             .groupBy({ it.key }) { it.value }
                             .map { (k, v) -> k to v.flatten() }.toMap()
-                    )
                 )
             )
     }
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt b/plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt
index b69c43d3..a886494e 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt
@@ -1,9 +1,9 @@
 package org.jetbrains.dokka.base.transformers.documentables
 
 import org.jetbrains.dokka.model.DModule
-import org.jetbrains.dokka.model.PlatformDependent
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.model.doc.DocumentationNode
-import org.jetbrains.dokka.pages.PlatformData
+import org.jetbrains.dokka.model.sourceSet
 import org.jetbrains.dokka.parsers.MarkdownParser
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.transformers.documentation.PreMergeDocumentableTransformer
@@ -12,14 +12,14 @@ import java.nio.file.Files
 import java.nio.file.Paths
 
 
-internal object ModuleAndPackageDocumentationTransformer : PreMergeDocumentableTransformer {
+internal class ModuleAndPackageDocumentationTransformer(val context: DokkaContext) : PreMergeDocumentableTransformer {
 
-    override fun invoke(original: List<DModule>, context: DokkaContext): List<DModule> {
+    override fun invoke(original: List<DModule>): List<DModule> {
 
         val modulesAndPackagesDocumentation =
             context.configuration.passesConfigurations
                 .map {
-                    Pair(it.moduleName, it.platformData) to
+                    Pair(it.moduleName, context.sourceSet(it)) to
                             it.includes.map { Paths.get(it) }
                                 .also {
                                     it.forEach {
@@ -50,10 +50,10 @@ internal object ModuleAndPackageDocumentationTransformer : PreMergeDocumentableT
         return original.map { module ->
 
             val moduleDocumentation =
-                module.platformData.mapNotNull { pd ->
+                module.sourceSets.mapNotNull { pd ->
                     val doc = modulesAndPackagesDocumentation[Pair(module.name, pd)]
                     val facade = context.platforms[pd]?.facade
-                        ?: return@mapNotNull null.also { context.logger.warn("Could not find platform data for ${pd.name}") }
+                        ?: return@mapNotNull null.also { context.logger.warn("Could not find platform data for ${pd.moduleName}/${pd.sourceSetName}") }
                     try {
                         doc?.get("Module")?.get(module.name)?.run {
                             pd to MarkdownParser(
@@ -68,15 +68,15 @@ internal object ModuleAndPackageDocumentationTransformer : PreMergeDocumentableT
                     }
                 }.toMap()
 
-            val packagesDocumentation = module.packages.map { dPackage ->
-                dPackage.name to dPackage.platformData.mapNotNull { platformData ->
-                    val doc = modulesAndPackagesDocumentation[Pair(module.name, platformData)]
-                    val facade = context.platforms[platformData]?.facade
-                        ?: return@mapNotNull null.also { context.logger.warn("Could not find platform data for ${platformData.name}") }
-                    val descriptor = facade.resolveSession.getPackageFragment(FqName(dPackage.name))
-                        ?: return@mapNotNull null.also { context.logger.warn("Could not find descriptor for ${dPackage.name}") }
-                    doc?.get("Package")?.get(dPackage.name)?.run {
-                        platformData to MarkdownParser(
+            val packagesDocumentation = module.packages.map {
+                it.name to it.sourceSets.mapNotNull { pd ->
+                    val doc = modulesAndPackagesDocumentation[Pair(module.name, pd)]
+                    val facade = context.platforms[pd]?.facade
+                        ?: return@mapNotNull null.also { context.logger.warn("Could not find platform data for ${pd.moduleName}/${pd.sourceSetName}") }
+                    val descriptor = facade.resolveSession.getPackageFragment(FqName(it.name))
+                        ?: return@mapNotNull null.also { context.logger.warn("Could not find descriptor for $") }
+                    doc?.get("Package")?.get(it.name)?.run {
+                        pd to MarkdownParser(
                             facade,
                             descriptor,
                             context.logger
@@ -86,13 +86,11 @@ internal object ModuleAndPackageDocumentationTransformer : PreMergeDocumentableT
             }.toMap()
 
             module.copy(
-                documentation = module.documentation.let { mergeDocumentation(it.map, moduleDocumentation) },
+                documentation = mergeDocumentation(module.documentation, moduleDocumentation),
                 packages = module.packages.map {
                     val packageDocumentation = packagesDocumentation[it.name]
                     if (packageDocumentation != null && packageDocumentation.isNotEmpty())
-                        it.copy(documentation = it.documentation.let { value ->
-                            mergeDocumentation(value.map, packageDocumentation)
-                        })
+                        it.copy(documentation = mergeDocumentation(it.documentation, packageDocumentation))
                     else
                         it
                 }
@@ -100,10 +98,10 @@ internal object ModuleAndPackageDocumentationTransformer : PreMergeDocumentableT
         }
     }
 
-    private fun mergeDocumentation(origin: Map<PlatformData, DocumentationNode>, new: Map<PlatformData, DocumentationNode>) = PlatformDependent(
+    private fun mergeDocumentation(origin: Map<SourceSetData, DocumentationNode>, new: Map<SourceSetData, DocumentationNode>) =
         (origin.asSequence() + new.asSequence())
             .distinct()
             .groupBy({ it.key }, { it.value })
             .mapValues { (_, values) -> DocumentationNode(values.flatMap { it.children }) }
-    )
+
 }
diff --git a/plugins/base/src/main/kotlin/transformers/pages/comments/CommentsToContentConverter.kt b/plugins/base/src/main/kotlin/transformers/pages/comments/CommentsToContentConverter.kt
index 778e0498..cb74441e 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/comments/CommentsToContentConverter.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/comments/CommentsToContentConverter.kt
@@ -1,5 +1,6 @@
 package org.jetbrains.dokka.base.transformers.pages.comments
 
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.model.doc.DocTag
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.dokka.pages.*
@@ -8,7 +9,7 @@ interface CommentsToContentConverter {
     fun buildContent(
         docTag: DocTag,
         dci: DCI,
-        platforms: Set<PlatformData>,
+        platforms: Set<SourceSetData>,
         styles: Set<Style> = emptySet(),
         extras: PropertyContainer<ContentNode> = PropertyContainer.empty()
     ): List<ContentNode>
diff --git a/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt b/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt
index 4e65bae9..85391549 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt
@@ -1,5 +1,6 @@
 package org.jetbrains.dokka.base.transformers.pages.comments
 
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.model.doc.*
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.dokka.pages.*
@@ -8,19 +9,19 @@ object DocTagToContentConverter : CommentsToContentConverter {
     override fun buildContent(
         docTag: DocTag,
         dci: DCI,
-        platforms: Set<PlatformData>,
+        sourceSets: Set<SourceSetData>,
         styles: Set<Style>,
         extra: PropertyContainer<ContentNode>
     ): List<ContentNode> {
 
         fun buildChildren(docTag: DocTag, newStyles: Set<Style> = emptySet(), newExtras: SimpleAttr? = null) =
             docTag.children.flatMap {
-                buildContent(it, dci, platforms, styles + newStyles, newExtras?.let { extra + it } ?: extra)
+                buildContent(it, dci, sourceSets, styles + newStyles, newExtras?.let { extra + it } ?: extra)
             }
 
         fun buildTableRows(rows: List<DocTag>, newStyle: Style): List<ContentGroup> =
             rows.flatMap {
-                buildContent(it, dci, platforms, styles + newStyle, extra) as List<ContentGroup>
+                buildContent(it, dci, sourceSets, styles + newStyle, extra) as List<ContentGroup>
             }
 
         fun buildHeader(level: Int) =
@@ -29,7 +30,7 @@ object DocTagToContentConverter : CommentsToContentConverter {
                     buildChildren(docTag),
                     level,
                     dci,
-                    platforms,
+                    sourceSets,
                     styles
                 )
             )
@@ -40,7 +41,7 @@ object DocTagToContentConverter : CommentsToContentConverter {
                     buildChildren(docTag),
                     ordered,
                     dci,
-                    platforms,
+                    sourceSets,
                     styles,
                     ((PropertyContainer.empty<ContentNode>()) + SimpleAttr("start", start.toString()))
                 )
@@ -48,7 +49,7 @@ object DocTagToContentConverter : CommentsToContentConverter {
 
         fun buildNewLine() = listOf(
             ContentBreakLine(
-                platforms
+                sourceSets
             )
         )
 
@@ -71,7 +72,7 @@ object DocTagToContentConverter : CommentsToContentConverter {
                     buildChildren(docTag),
                     docTag.params.get("href")!!,
                     dci,
-                    platforms,
+                    sourceSets,
                     styles
                 )
             )
@@ -83,7 +84,7 @@ object DocTagToContentConverter : CommentsToContentConverter {
                         setOf(docTag.dri),
                         ContentKind.Symbol
                     ),
-                    platforms,
+                    sourceSets,
                     styles
                 )
             )
@@ -92,7 +93,7 @@ object DocTagToContentConverter : CommentsToContentConverter {
                     buildChildren(docTag),
                     "",
                     dci,
-                    platforms,
+                    sourceSets,
                     styles
                 )
             )
@@ -101,7 +102,7 @@ object DocTagToContentConverter : CommentsToContentConverter {
                     buildChildren(docTag),
                     "",
                     dci,
-                    platforms,
+                    sourceSets,
                     styles
                 )
             )
@@ -110,7 +111,7 @@ object DocTagToContentConverter : CommentsToContentConverter {
                     address = docTag.params["href"]!!,
                     altText = docTag.params["alt"],
                     dci = dci,
-                    platforms = platforms,
+                    sourceSets = sourceSets,
                     style = styles,
                     extra = extra
                 )
@@ -119,7 +120,7 @@ object DocTagToContentConverter : CommentsToContentConverter {
                 ContentText(
                     "",
                     dci,
-                    platforms,
+                    sourceSets,
                     setOf()
                 )
             )
@@ -127,7 +128,7 @@ object DocTagToContentConverter : CommentsToContentConverter {
                 ContentText(
                     docTag.body,
                     dci,
-                    platforms,
+                    sourceSets,
                     styles
                 )
             )
@@ -137,7 +138,7 @@ object DocTagToContentConverter : CommentsToContentConverter {
                     buildTableRows(docTag.children.filterIsInstance<Th>(), CommentTable),
                     buildTableRows(docTag.children.filterIsInstance<Tr>(), CommentTable),
                     dci,
-                    platforms,
+                    sourceSets,
                     styles + CommentTable
                 )
             )
@@ -145,10 +146,10 @@ object DocTagToContentConverter : CommentsToContentConverter {
             is Tr -> listOf(
                 ContentGroup(
                     docTag.children.map {
-                        ContentGroup(buildChildren(it), dci, platforms, styles, extra)
+                        ContentGroup(buildChildren(it), dci, sourceSets, styles, extra)
                     },
                     dci,
-                    platforms,
+                    sourceSets,
                     styles
                 )
             )
diff --git a/plugins/base/src/main/kotlin/transformers/pages/merger/SameMethodNamePageMergerStrategy.kt b/plugins/base/src/main/kotlin/transformers/pages/merger/SameMethodNamePageMergerStrategy.kt
index fb904f47..31e79555 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/merger/SameMethodNamePageMergerStrategy.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/merger/SameMethodNamePageMergerStrategy.kt
@@ -32,6 +32,6 @@ object SameMethodNamePageMergerStrategy : PageMergerStrategy {
     }
 
     fun asGroup(dci: DCI, nodes: List<ContentNode>): ContentGroup =
-        nodes.first().let { ContentGroup(nodes, dci, it.platforms, it.style, it.extra) }
+        nodes.first().let { ContentGroup(nodes, dci, it.sourceSets, it.style, it.extra) }
 
 }
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
index 78fc4d33..9b04af40 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
@@ -8,8 +8,10 @@ import org.jetbrains.dokka.analysis.AnalysisEnvironment
 import org.jetbrains.dokka.analysis.DokkaResolutionFacade
 import org.jetbrains.dokka.base.renderers.platforms
 import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.model.doc.Sample
 import org.jetbrains.dokka.model.properties.PropertyContainer
+import org.jetbrains.dokka.model.sourceSet
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.transformers.pages.PageTransformer
@@ -31,16 +33,16 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer {
         val analysis = setUpAnalysis(context)
 
         return input.transformContentPagesTree { page ->
-            page.documentable?.documentation?.allEntries?.fold(page) { acc, entry ->
-                entry.second.children.filterIsInstance<Sample>().fold(acc) { acc, sample ->
-                    acc.modified(content = acc.content.addSample(page, entry.first, sample.name, analysis))
+            page.documentable?.documentation?.entries?.fold(page) { acc, entry ->
+                entry.value.children.filterIsInstance<Sample>().fold(acc) { acc, sample ->
+                    acc.modified(content = acc.content.addSample(page, entry.key, sample.name, analysis))
                 }
             } ?: page
         }
     }
 
     private fun setUpAnalysis(context: DokkaContext) = context.configuration.passesConfigurations.map {
-        it.platformData to AnalysisEnvironment(DokkaGenerator.DokkaMessageCollector(context.logger), it.analysisPlatform).run {
+        context.sourceSet(it) to AnalysisEnvironment(DokkaGenerator.DokkaMessageCollector(context.logger), it.analysisPlatform).run {
             if (analysisPlatform == Platform.jvm) {
                 addClasspath(PathUtil.getJdkClassesRootsFromCurrentJre())
             }
@@ -56,12 +58,9 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer {
         }
     }.toMap()
 
-    private fun ContentNode.addSample(contentPage: ContentPage, platform: PlatformData?, fqName: String, analysis: Map<PlatformData, EnvironmentAndFacade>): ContentNode {
-        val facade = if(platform == null) {
-            analysis.entries.find { it.key.platformType.name == "common" }?.value
-        } else {
-            analysis[platform]
-        }?.facade ?: return this.also { context.logger.warn("Cannot resolve facade for platform ${platform?.name ?: "expect"}") }
+    private fun ContentNode.addSample(contentPage: ContentPage, platform: SourceSetData, fqName: String, analysis: Map<SourceSetData, EnvironmentAndFacade>): ContentNode {
+        val facade = analysis[platform]?.facade ?:
+            return this.also { context.logger.warn("Cannot resolve facade for platform ${platform.moduleName}")}
         val psiElement = fqNameToPsiElement(facade, fqName) ?:
             return this.also { context.logger.warn("Cannot find PsiElement corresponding to $fqName") }
         val imports = processImports(psiElement) // TODO: Process somehow imports. Maybe just attach them at the top of each body
@@ -96,13 +95,13 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer {
         return DescriptorToSourceUtils.descriptorToDeclaration(symbol)
     }
 
-    private fun contentCode(platforms: List<PlatformData>, dri: Set<DRI>, content: String, language: String) =
+    private fun contentCode(sourceSets: List<SourceSetData>, dri: Set<DRI>, content: String, language: String) =
         ContentCode(
             children = listOf(
                 ContentText(
                     text = content,
                     dci = DCI(dri, ContentKind.BriefComment),
-                    platforms = platforms.toSet(),
+                    sourceSets = sourceSets.toSet(),
                     style = emptySet(),
                     extra = PropertyContainer.empty()
                 )
@@ -110,7 +109,7 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer {
             language = language,
             extra = PropertyContainer.empty(),
             dci = DCI(dri, ContentKind.Source),
-            platforms = platforms.toSet(),
+            sourceSets = sourceSets.toSet(),
             style = emptySet()
         )
 }
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt
index fa73e757..876326d1 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt
@@ -5,9 +5,12 @@ import com.intellij.psi.PsiDocumentManager
 import org.jetbrains.dokka.DokkaConfiguration
 import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
 import org.jetbrains.dokka.model.DescriptorDocumentableSource
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.model.DocumentableSource
 import org.jetbrains.dokka.model.PsiDocumentableSource
 import org.jetbrains.dokka.model.WithExpectActual
+import org.jetbrains.dokka.model.properties.PropertyContainer
+import org.jetbrains.dokka.model.sourceSet
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.transformers.pages.PageTransformer
@@ -30,11 +33,11 @@ class SourceLinksTransformer(val context: DokkaContext, val builder: PageContent
         }
 
     private fun getSourceLinks() = context.configuration.passesConfigurations
-        .flatMap { it.sourceLinks.map { sl -> SourceLink(sl, it.platformData) } }
+        .flatMap { it.sourceLinks.map { sl -> SourceLink(sl, context.sourceSetCache.getSourceSet(it)) } }
 
     private fun resolveSources(documentable: WithExpectActual) = documentable.sources
         .mapNotNull { entry ->
-            getSourceLinks().find { entry.value.path.contains(it.path) && it.platformData == entry.key }?.let {
+            getSourceLinks().find { entry.value.path.contains(it.path) && it.sourceSetData == entry.key }?.let {
                 Pair(
                     entry.key,
                     entry.value.toLink(it)
@@ -42,7 +45,7 @@ class SourceLinksTransformer(val context: DokkaContext, val builder: PageContent
             }
         }
 
-    private fun ContentPage.addSourcesContent(sources: List<Pair<PlatformData, String>>) = builder
+    private fun ContentPage.addSourcesContent(sources: List<Pair<SourceSetData, String>>) = builder
         .buildSourcesContent(this, sources)
         .let {
             this.modified(
@@ -52,10 +55,10 @@ class SourceLinksTransformer(val context: DokkaContext, val builder: PageContent
 
     private fun PageContentBuilder.buildSourcesContent(
         node: ContentPage,
-        sources: List<Pair<PlatformData, String>>
+        sources: List<Pair<SourceSetData, String>>
     ) = contentFor(
         node.dri.first(),
-        node.documentable!!.platformData.toSet()
+        node.documentable!!.sourceSets.toSet()
     ) {
         header(2) { text("Sources") }
         +ContentTable(
@@ -66,7 +69,7 @@ class SourceLinksTransformer(val context: DokkaContext, val builder: PageContent
                 }
             },
             DCI(node.dri, ContentKind.Source),
-            node.documentable!!.platformData.toSet(),
+            node.documentable!!.sourceSets.toSet(),
             style = emptySet()
         )
     }
@@ -94,7 +97,7 @@ class SourceLinksTransformer(val context: DokkaContext, val builder: PageContent
             else -> ContentGroup(
                 children = listOf(this, table),
                 extra = this.extra,
-                platforms = this.platforms,
+                sourceSets = this.sourceSets,
                 dci = this.dci,
                 style = this.style
             )
@@ -107,8 +110,8 @@ class SourceLinksTransformer(val context: DokkaContext, val builder: PageContent
     }
 }
 
-data class SourceLink(val path: String, val url: String, val lineSuffix: String?, val platformData: PlatformData) {
-    constructor(sourceLinkDefinition: DokkaConfiguration.SourceLinkDefinition, platformData: PlatformData) : this(
-        sourceLinkDefinition.path, sourceLinkDefinition.url, sourceLinkDefinition.lineSuffix, platformData
+data class SourceLink(val path: String, val url: String, val lineSuffix: String?, val sourceSetData: SourceSetData) {
+    constructor(sourceLinkDefinition: DokkaConfiguration.SourceLinkDefinition, sourceSetData: SourceSetData) : this(
+        sourceLinkDefinition.path, sourceLinkDefinition.url, sourceLinkDefinition.lineSuffix, sourceSetData
     )
 }
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index 128b9bd4..7cc96a24 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -7,7 +7,6 @@ import org.jetbrains.dokka.links.withClass
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.doc.*
 import org.jetbrains.dokka.model.properties.PropertyContainer
-import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.parsers.MarkdownParser
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.utilities.DokkaLogger
@@ -20,6 +19,7 @@ import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies
 import org.jetbrains.kotlin.idea.kdoc.findKDoc
+import org.jetbrains.kotlin.load.kotlin.toSourceElement
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.calls.components.isVararg
@@ -37,35 +37,35 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 object DefaultDescriptorToDocumentableTranslator : SourceToDocumentableTranslator {
 
-    override fun invoke(platformData: PlatformData, context: DokkaContext): DModule {
+    override fun invoke(sourceSet: SourceSetData, context: DokkaContext): DModule {
 
-        val (environment, facade) = context.platforms.getValue(platformData)
+        val (environment, facade) = context.platforms.getValue(sourceSet)
         val packageFragments = environment.getSourceFiles().asSequence()
             .map { it.packageFqName }
             .distinct()
             .mapNotNull { facade.resolveSession.getPackageFragment(it) }
             .toList()
 
-        return DokkaDescriptorVisitor(platformData, context.platforms.getValue(platformData).facade, context.logger).run {
+        return DokkaDescriptorVisitor(sourceSet, context.platforms.getValue(sourceSet).facade, context.logger).run {
             packageFragments.mapNotNull { it.safeAs<PackageFragmentDescriptor>() }.map {
                 visitPackageFragmentDescriptor(
                     it,
-                    DRIWithPlatformInfo(DRI.topLevel, PlatformDependent.empty())
+                    DRIWithPlatformInfo(DRI.topLevel, emptyMap())
                 )
             }
-        }.let { DModule(platformData.name, it, PlatformDependent.empty(), listOf(platformData)) }
+        }.let { DModule(sourceSet.moduleName, it, emptyMap(), null, listOf(sourceSet)) }
     }
 }
 
 data class DRIWithPlatformInfo(
     val dri: DRI,
-    val actual: PlatformDependent<DocumentableSource>
+    val actual: SourceSetDependent<DocumentableSource>
 )
 
-fun DRI.withEmptyInfo() = DRIWithPlatformInfo(this, PlatformDependent.empty())
+fun DRI.withEmptyInfo() = DRIWithPlatformInfo(this, emptyMap())
 
 private class DokkaDescriptorVisitor(
-    private val platformData: PlatformData,
+    private val sourceSet: SourceSetData,
     private val resolutionFacade: DokkaResolutionFacade,
     private val logger: DokkaLogger
 ) : DeclarationDescriptorVisitorEmptyBodies<Documentable, DRIWithPlatformInfo>() {
@@ -73,23 +73,30 @@ private class DokkaDescriptorVisitor(
         throw IllegalStateException("${javaClass.simpleName} should never enter ${descriptor.javaClass.simpleName}")
     }
 
+    private fun Collection<DeclarationDescriptor>.filterDescriptorsInSourceSet() = filter {
+            val path = it.toSourceElement.containingFile.toString()
+            path.isNotBlank() && sourceSet.sourceRoots.any { root -> path.startsWith(root.path) }
+    }
+
+    private fun <T> T.toSourceSetDependent() = mapOf(sourceSet to this)
+
     override fun visitPackageFragmentDescriptor(
         descriptor: PackageFragmentDescriptor,
         parent: DRIWithPlatformInfo
     ): DPackage {
-        val name = descriptor.fqName.asString().takeUnless { it.isBlank() }
-            ?: "[" + platformData.targets.joinToString(" ") + " root]"// TODO: error-prone, find a better way to do it
+        val name = descriptor.fqName.asString().takeUnless { it.isBlank() } ?:
+            "[${sourceSet.sourceSetName} root]"// TODO: error-prone, find a better way to do it
         val driWithPlatform = DRI(packageName = name).withEmptyInfo()
         val scope = descriptor.getMemberScope()
 
         return DPackage(
             dri = driWithPlatform.dri,
-            functions = scope.functions(driWithPlatform),
-            properties = scope.properties(driWithPlatform),
-            classlikes = scope.classlikes(driWithPlatform),
-            typealiases = scope.typealiases(driWithPlatform),
-            documentation = descriptor.resolveDescriptorData(platformData),
-            platformData = listOf(platformData)
+            functions = scope.functions(driWithPlatform, true),
+            properties = scope.properties(driWithPlatform, true),
+            classlikes = scope.classlikes(driWithPlatform, true),
+            typealiases = scope.typealiases(driWithPlatform, true),
+            documentation = descriptor.resolveDescriptorData(),
+            sourceSets = listOf(sourceSet)
         )
     }
 
@@ -106,7 +113,7 @@ private class DokkaDescriptorVisitor(
         val driWithPlatform = parent.dri.withClass(descriptor.name.asString()).withEmptyInfo()
         val scope = descriptor.unsubstitutedMemberScope
         val isExpect = descriptor.isExpect
-        val info = descriptor.resolveClassDescriptionData(if (!isExpect) platformData else null)
+        val info = descriptor.resolveClassDescriptionData()
 
 
         return DInterface(
@@ -116,14 +123,13 @@ private class DokkaDescriptorVisitor(
             properties = scope.properties(driWithPlatform),
             classlikes = scope.classlikes(driWithPlatform),
             sources = descriptor.createSources(),
-            visibility = if (isExpect) PlatformDependent.expectFrom(descriptor.visibility.toDokkaVisibility())
-            else PlatformDependent.from(platformData, descriptor.visibility.toDokkaVisibility()),
-            supertypes = if (isExpect) PlatformDependent.expectFrom(info.supertypes)
-            else PlatformDependent.from(platformData, info.supertypes),
+            expectPresentInSet = sourceSet.takeIf { isExpect },
+            visibility = descriptor.visibility.toDokkaVisibility().toSourceSetDependent(),
+            supertypes = info.supertypes.toSourceSetDependent(),
             documentation = info.docs,
             generics = descriptor.typeConstructor.parameters.map { it.toTypeParameter() },
             companion = descriptor.companion(driWithPlatform),
-            platformData = listOf(platformData),
+            sourceSets = listOf(sourceSet),
             extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
         )
     }
@@ -132,7 +138,7 @@ private class DokkaDescriptorVisitor(
         val driWithPlatform = parent.dri.withClass(descriptor.name.asString()).withEmptyInfo()
         val scope = descriptor.unsubstitutedMemberScope
         val isExpect = descriptor.isExpect
-        val info = descriptor.resolveClassDescriptionData(if (!isExpect) platformData else null)
+        val info = descriptor.resolveClassDescriptionData()
 
 
         return DObject(
@@ -142,12 +148,11 @@ private class DokkaDescriptorVisitor(
             properties = scope.properties(driWithPlatform),
             classlikes = scope.classlikes(driWithPlatform),
             sources = descriptor.createSources(),
-            visibility = if (isExpect) PlatformDependent.expectFrom(descriptor.visibility.toDokkaVisibility())
-            else PlatformDependent.from(platformData, descriptor.visibility.toDokkaVisibility()),
-            supertypes = if (isExpect) PlatformDependent.expectFrom(info.supertypes)
-            else PlatformDependent.from(platformData, info.supertypes),
+            expectPresentInSet = sourceSet.takeIf { isExpect },
+            visibility = descriptor.visibility.toDokkaVisibility().toSourceSetDependent(),
+            supertypes = info.supertypes.toSourceSetDependent(),
             documentation = info.docs,
-            platformData = listOf(platformData),
+            sourceSets = listOf(sourceSet),
             extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
         )
     }
@@ -156,7 +161,7 @@ private class DokkaDescriptorVisitor(
         val driWithPlatform = parent.dri.withClass(descriptor.name.asString()).withEmptyInfo()
         val scope = descriptor.unsubstitutedMemberScope
         val isExpect = descriptor.isExpect
-        val info = descriptor.resolveClassDescriptionData(if (!isExpect) platformData else null)
+        val info = descriptor.resolveClassDescriptionData()
 
         return DEnum(
             dri = driWithPlatform.dri,
@@ -167,13 +172,12 @@ private class DokkaDescriptorVisitor(
             properties = scope.properties(driWithPlatform),
             classlikes = scope.classlikes(driWithPlatform),
             sources = descriptor.createSources(),
-            visibility = if (isExpect) PlatformDependent.expectFrom(descriptor.visibility.toDokkaVisibility())
-            else PlatformDependent.from(platformData, descriptor.visibility.toDokkaVisibility()),
-            supertypes = if (isExpect) PlatformDependent.expectFrom(info.supertypes)
-            else PlatformDependent.from(platformData, info.supertypes),
+            expectPresentInSet = sourceSet.takeIf { isExpect },
+            visibility = descriptor.visibility.toDokkaVisibility().toSourceSetDependent(),
+            supertypes = info.supertypes.toSourceSetDependent(),
             documentation = info.docs,
             companion = descriptor.companion(driWithPlatform),
-            platformData = listOf(platformData),
+            sourceSets = listOf(sourceSet),
             extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
         )
     }
@@ -186,11 +190,12 @@ private class DokkaDescriptorVisitor(
         return DEnumEntry(
             dri = driWithPlatform.dri,
             name = descriptor.name.asString(),
-            documentation = descriptor.resolveDescriptorData(if (!isExpect) platformData else null),
+            documentation = descriptor.resolveDescriptorData(),
             classlikes = scope.classlikes(driWithPlatform),
             functions = scope.functions(driWithPlatform),
             properties = scope.properties(driWithPlatform),
-            platformData = listOf(platformData),
+            sourceSets = listOf(sourceSet),
+            expectPresentInSet = sourceSet.takeIf { isExpect },
             extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
         )
     }
@@ -202,14 +207,15 @@ private class DokkaDescriptorVisitor(
         return DAnnotation(
             dri = driWithPlatform.dri,
             name = descriptor.name.asString(),
-            documentation = descriptor.resolveDescriptorData(platformData),
+            documentation = descriptor.resolveDescriptorData(),
             classlikes = scope.classlikes(driWithPlatform),
             functions = scope.functions(driWithPlatform),
             properties = scope.properties(driWithPlatform),
-            platformData = listOf(platformData),
+            expectPresentInSet = null,
+            sourceSets = listOf(sourceSet),
             extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations()),
             companion = descriptor.companionObjectDescriptor?.let { objectDescriptor(it, driWithPlatform) },
-            visibility = PlatformDependent(mapOf(platformData to descriptor.visibility.toDokkaVisibility())),
+            visibility = descriptor.visibility.toDokkaVisibility().toSourceSetDependent(),
             constructors = descriptor.constructors.map { visitConstructorDescriptor(it, driWithPlatform) },
             sources = descriptor.createSources()
         )
@@ -219,7 +225,7 @@ private class DokkaDescriptorVisitor(
         val driWithPlatform = parent.dri.withClass(descriptor.name.asString()).withEmptyInfo()
         val scope = descriptor.unsubstitutedMemberScope
         val isExpect = descriptor.isExpect
-        val info = descriptor.resolveClassDescriptionData(if (!isExpect) platformData else null)
+        val info = descriptor.resolveClassDescriptionData()
         val actual = descriptor.createSources()
 
         return DClass(
@@ -229,23 +235,21 @@ private class DokkaDescriptorVisitor(
                 visitConstructorDescriptor(
                     it,
                     if (it.isPrimary) DRIWithPlatformInfo(driWithPlatform.dri, actual)
-                    else DRIWithPlatformInfo(driWithPlatform.dri, PlatformDependent.empty())
+                    else DRIWithPlatformInfo(driWithPlatform.dri, emptyMap())
                 )
             },
             functions = scope.functions(driWithPlatform),
             properties = scope.properties(driWithPlatform),
             classlikes = scope.classlikes(driWithPlatform),
             sources = actual,
-            visibility = if (isExpect) PlatformDependent.expectFrom(descriptor.visibility.toDokkaVisibility())
-            else PlatformDependent.from(platformData, descriptor.visibility.toDokkaVisibility()),
-            supertypes = if (isExpect) PlatformDependent.expectFrom(info.supertypes)
-            else PlatformDependent.from(platformData, info.supertypes),
+            expectPresentInSet = sourceSet.takeIf { isExpect },
+            visibility = descriptor.visibility.toDokkaVisibility().toSourceSetDependent(),
+            supertypes = info.supertypes.toSourceSetDependent(),
             generics = descriptor.typeConstructor.parameters.map { it.toTypeParameter() },
             documentation = info.docs,
-            modifier = if (isExpect) PlatformDependent.expectFrom(descriptor.modifier())
-            else PlatformDependent.from(platformData, descriptor.modifier()),
+            modifier =   descriptor.modifier().toSourceSetDependent(),
             companion = descriptor.companion(driWithPlatform),
-            platformData = listOf(platformData),
+            sourceSets = listOf(sourceSet),
             extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
         )
     }
@@ -268,13 +272,12 @@ private class DokkaDescriptorVisitor(
             setter = descriptor.accessors.filterIsInstance<PropertySetterDescriptor>().singleOrNull()?.let {
                 visitPropertyAccessorDescriptor(it, descriptor, dri)
             },
-            visibility = if (isExpect) PlatformDependent.expectFrom(descriptor.visibility.toDokkaVisibility())
-            else PlatformDependent.from(platformData, descriptor.visibility.toDokkaVisibility()),
-            documentation = descriptor.resolveDescriptorData(if (!isExpect) platformData else null),
-            modifier = if (isExpect) PlatformDependent.expectFrom(descriptor.modifier())
-            else PlatformDependent.from(platformData, descriptor.modifier()),
+            visibility = descriptor.visibility.toDokkaVisibility().toSourceSetDependent(),
+            documentation = descriptor.resolveDescriptorData(),
+            modifier = descriptor.modifier().toSourceSetDependent(),
             type = descriptor.returnType!!.toBound(),
-            platformData = listOf(platformData),
+            expectPresentInSet = sourceSet.takeIf { isExpect },
+            sourceSets = listOf(sourceSet),
             generics = descriptor.typeParameters.map { it.toTypeParameter() },
             extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
         )
@@ -301,15 +304,14 @@ private class DokkaDescriptorVisitor(
             parameters = descriptor.valueParameters.mapIndexed { index, desc ->
                 parameter(index, desc, DRIWithPlatformInfo(dri, actual))
             },
+            expectPresentInSet = sourceSet.takeIf { isExpect },
             sources = actual,
-            visibility = if (isExpect) PlatformDependent.expectFrom(descriptor.visibility.toDokkaVisibility())
-            else PlatformDependent.from(platformData, descriptor.visibility.toDokkaVisibility()),
+            visibility = descriptor.visibility.toDokkaVisibility().toSourceSetDependent(),
             generics = descriptor.typeParameters.map { it.toTypeParameter() },
-            documentation = descriptor.resolveDescriptorData(if (!isExpect) platformData else null),
-            modifier = if (isExpect) PlatformDependent.expectFrom(descriptor.modifier())
-            else PlatformDependent.from(platformData, descriptor.modifier()),
+            documentation = descriptor.resolveDescriptorData(),
+            modifier = descriptor.modifier().toSourceSetDependent(),
             type = descriptor.returnType!!.toBound(),
-            platformData = listOf(platformData),
+            sourceSets = listOf(sourceSet),
             extra = PropertyContainer.withAll(
                 InheritedFunction(isInherited),
                 descriptor.additionalExtras(), descriptor.getAnnotations()
@@ -333,41 +335,27 @@ private class DokkaDescriptorVisitor(
                 parameter(index, desc, DRIWithPlatformInfo(dri, actual))
             },
             sources = actual,
-            visibility = if (isExpect) PlatformDependent.expectFrom(descriptor.visibility.toDokkaVisibility())
-            else PlatformDependent.from(platformData, descriptor.visibility.toDokkaVisibility()),
-            documentation = descriptor.resolveDescriptorData(if (!isExpect) platformData else null).let {
+            expectPresentInSet = sourceSet.takeIf { isExpect },
+            visibility = descriptor.visibility.toDokkaVisibility().toSourceSetDependent(),
+            documentation = descriptor.resolveDescriptorData().let { sourceSetDependent ->
                 if (descriptor.isPrimary) {
-                    it.copy(
-                        map = PlatformDependent.from(it.map.map {
-                            Pair(
-                                it.key,
-                                it.value.copy(children = (it.value.children.find { it is Constructor }?.root?.let { constructor ->
-                                    listOf(
-                                        Description(constructor)
-                                    )
-                                } ?: emptyList<TagWrapper>()) + it.value.children.filterIsInstance<Param>())
-                            )
-                        }),
-                        expect = it.expect?.copy(children = (it.expect?.children?.find { it is Constructor }?.root?.let { constructor ->
-                            listOf(
-                                Description(constructor)
-                            )
-                        } ?: emptyList<TagWrapper>()) + it.expect!!.children.filterIsInstance<Param>())
-                    )
+                    sourceSetDependent.map { entry ->
+                        Pair(entry.key, entry.value.copy(children = (entry.value.children.find { it is Constructor }?.root?.let { constructor ->
+                            listOf( Description(constructor) )
+                        } ?: emptyList<TagWrapper>()) + entry.value.children.filterIsInstance<Param>()))
+                    }.toMap()
                 } else {
-                    it
+                    sourceSetDependent
                 }
             },
             type = descriptor.returnType.toBound(),
-            modifier = if (isExpect) PlatformDependent.expectFrom(descriptor.modifier())
-            else PlatformDependent.from(platformData, descriptor.modifier()),
+            modifier = descriptor.modifier().toSourceSetDependent(),
             generics = descriptor.typeParameters.map { it.toTypeParameter() },
-            platformData = listOf(platformData),
+            sourceSets = listOf(sourceSet),
             extra = PropertyContainer.withAll<DFunction>(descriptor.additionalExtras(), descriptor.getAnnotations())
                 .let {
-                    if (descriptor.isPrimary) {
-                        it + PrimaryConstructorExtra
-                    } else it
+                    if(descriptor.isPrimary) { it + PrimaryConstructorExtra }
+                    else it
                 }
         )
     }
@@ -379,8 +367,9 @@ private class DokkaDescriptorVisitor(
         dri = parent.dri.copy(target = 0),
         name = null,
         type = descriptor.type.toBound(),
-        documentation = descriptor.resolveDescriptorData(platformData),
-        platformData = listOf(platformData)
+        expectPresentInSet = null,
+        documentation = descriptor.resolveDescriptorData(),
+        sourceSets = listOf(sourceSet)
     )
 
     private fun visitPropertyAccessorDescriptor(
@@ -397,8 +386,9 @@ private class DokkaDescriptorVisitor(
                 parent.copy(target = 1),
                 this.name.asString(),
                 type = this.type.toBound(),
-                documentation = descriptor.resolveDescriptorData(if (!isExpect) platformData else null),
-                platformData = listOf(platformData),
+                expectPresentInSet = sourceSet.takeIf { isExpect },
+                documentation = descriptor.resolveDescriptorData(),
+                sourceSets = listOf(sourceSet),
                 extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
             )
 
@@ -420,13 +410,12 @@ private class DokkaDescriptorVisitor(
             name,
             isConstructor = false,
             parameters = parameters,
-            visibility = if (isExpect) PlatformDependent.expectFrom(descriptor.visibility.toDokkaVisibility())
-            else PlatformDependent.from(platformData, descriptor.visibility.toDokkaVisibility()),
-            documentation = descriptor.resolveDescriptorData(if (!isExpect) platformData else null),
+            visibility = descriptor.visibility.toDokkaVisibility().toSourceSetDependent(),
+            documentation = descriptor.resolveDescriptorData(),
             type = descriptor.returnType!!.toBound(),
             generics = descriptor.typeParameters.map { it.toTypeParameter() },
-            modifier = if (isExpect) PlatformDependent.expectFrom(descriptor.modifier())
-            else PlatformDependent.from(platformData, descriptor.modifier()),
+            modifier = descriptor.modifier().toSourceSetDependent(),
+            expectPresentInSet = sourceSet.takeIf { isExpect },
             receiver = descriptor.extensionReceiverParameter?.let {
                 visitReceiverParameterDescriptor(
                     it,
@@ -434,7 +423,7 @@ private class DokkaDescriptorVisitor(
                 )
             },
             sources = descriptor.createSources(),
-            platformData = listOf(platformData),
+            sourceSets = listOf(sourceSet),
             extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
         )
     }
@@ -445,11 +434,11 @@ private class DokkaDescriptorVisitor(
                 dri = DRI.from(this),
                 name = name.asString(),
                 type = defaultType.toBound(),
-                underlyingType = PlatformDependent.from(platformData, underlyingType.toBound()),
-                visibility = if (isExpect) PlatformDependent.expectFrom(visibility.toDokkaVisibility())
-                else PlatformDependent.from(platformData, visibility.toDokkaVisibility()),
-                documentation = resolveDescriptorData(platformData),
-                platformData = listOf(platformData)
+                expectPresentInSet = null,
+                underlyingType = underlyingType.toBound().toSourceSetDependent(),
+                visibility = visibility.toDokkaVisibility().toSourceSetDependent(),
+                documentation = resolveDescriptorData(),
+                sourceSets = listOf(sourceSet)
             )
         }
 
@@ -458,8 +447,9 @@ private class DokkaDescriptorVisitor(
             dri = parent.dri.copy(target = index + 1),
             name = descriptor.name.asString(),
             type = descriptor.type.toBound(),
-            documentation = descriptor.resolveDescriptorData(platformData),
-            platformData = listOf(platformData),
+            expectPresentInSet = null,
+            documentation = descriptor.resolveDescriptorData(),
+            sourceSets = listOf(sourceSet),
             extra = PropertyContainer.withAll(
                 listOfNotNull(
                     descriptor.additionalExtras(),
@@ -468,18 +458,23 @@ private class DokkaDescriptorVisitor(
             )
         )
 
-    private fun MemberScope.functions(parent: DRIWithPlatformInfo): List<DFunction> =
-        getContributedDescriptors(DescriptorKindFilter.FUNCTIONS) { true }
+    private fun MemberScope.getContributedDescriptors(kindFilter: DescriptorKindFilter, shouldFilter: Boolean) =
+        getContributedDescriptors(kindFilter) { true }.let {
+            if (shouldFilter) it.filterDescriptorsInSourceSet() else it
+        }
+
+    private fun MemberScope.functions(parent: DRIWithPlatformInfo, packageLevel: Boolean = false): List<DFunction> =
+        getContributedDescriptors(DescriptorKindFilter.FUNCTIONS, packageLevel)
             .filterIsInstance<FunctionDescriptor>()
             .map { visitFunctionDescriptor(it, parent) }
 
-    private fun MemberScope.properties(parent: DRIWithPlatformInfo): List<DProperty> =
-        getContributedDescriptors(DescriptorKindFilter.VALUES) { true }
+    private fun MemberScope.properties(parent: DRIWithPlatformInfo, packageLevel: Boolean = false): List<DProperty> =
+        getContributedDescriptors(DescriptorKindFilter.VALUES, packageLevel)
             .filterIsInstance<PropertyDescriptor>()
             .map { visitPropertyDescriptor(it, parent) }
 
-    private fun MemberScope.classlikes(parent: DRIWithPlatformInfo): List<DClasslike> =
-        getContributedDescriptors(DescriptorKindFilter.CLASSIFIERS) { true }
+    private fun MemberScope.classlikes(parent: DRIWithPlatformInfo, packageLevel: Boolean = false): List<DClasslike> =
+        getContributedDescriptors(DescriptorKindFilter.CLASSIFIERS, packageLevel)
             .filter { it is ClassDescriptor && it.kind != ClassKind.ENUM_ENTRY }
             .map { visitClassDescriptor(it as ClassDescriptor, parent) }
             .mapNotNull { it as? DClasslike }
@@ -489,8 +484,8 @@ private class DokkaDescriptorVisitor(
             .filterIsInstance<PackageFragmentDescriptor>()
             .map { visitPackageFragmentDescriptor(it, parent) }
 
-    private fun MemberScope.typealiases(parent: DRIWithPlatformInfo): List<DTypeAlias> =
-        getContributedDescriptors(DescriptorKindFilter.TYPE_ALIASES) { true }
+    private fun MemberScope.typealiases(parent: DRIWithPlatformInfo, packageLevel: Boolean = false): List<DTypeAlias> =
+        getContributedDescriptors(DescriptorKindFilter.TYPE_ALIASES, packageLevel)
             .filterIsInstance<TypeAliasDescriptor>()
             .map { visitTypeAliasDescriptor(it, parent) }
 
@@ -500,19 +495,14 @@ private class DokkaDescriptorVisitor(
             .filter { it.kind == ClassKind.ENUM_ENTRY }
             .map { enumEntryDescriptor(it, parent) }
 
-    private fun DeclarationDescriptor.resolveDescriptorData(platformData: PlatformData?): PlatformDependent<DocumentationNode> = getDocumentation().let {
-        if (it.children.isEmpty())
-            PlatformDependent.empty()
-        else if (platformData != null)
-            PlatformDependent.from(platformData, it)
-        else
-            PlatformDependent.expectFrom(it)
-    }
 
-    private fun ClassDescriptor.resolveClassDescriptionData(platformData: PlatformData?): ClassInfo {
+    private fun DeclarationDescriptor.resolveDescriptorData(): SourceSetDependent<DocumentationNode> =
+        getDocumentation()?.toSourceSetDependent() ?: emptyMap()
+
+    private fun ClassDescriptor.resolveClassDescriptionData(): ClassInfo {
         return ClassInfo(
             (getSuperInterfaces() + getAllSuperclassesWithoutAny()).map { DRI.from(it) },
-            resolveDescriptorData(platformData)
+            resolveDescriptorData()
         )
     }
 
@@ -520,9 +510,10 @@ private class DokkaDescriptorVisitor(
         DTypeParameter(
             DRI.from(this),
             name.identifier,
-            PlatformDependent.from(platformData, getDocumentation()),
+            resolveDescriptorData(),
+            null,
             upperBounds.map { it.toBound() },
-            listOf(platformData),
+            listOf(sourceSet),
             extra = PropertyContainer.withAll(additionalExtras())
         )
 
@@ -555,7 +546,7 @@ private class DokkaDescriptorVisitor(
 
     private fun DeclarationDescriptor.getDocumentation() = findKDoc().let {
         MarkdownParser(resolutionFacade, this, logger).parseFromKDocTag(it)
-    }
+    }.takeIf { it.children.isNotEmpty() }
 
     private fun ClassDescriptor.companion(dri: DRIWithPlatformInfo): DObject? = companionObjectDescriptor?.let {
         objectDescriptor(it, dri)
@@ -569,11 +560,8 @@ private class DokkaDescriptorVisitor(
         else -> KotlinModifier.Empty
     }
 
-    private fun MemberDescriptor.createSources(): PlatformDependent<DocumentableSource> = if (isExpect()) {
-        PlatformDependent(emptyMap(), DescriptorDocumentableSource(this))
-    } else {
-        PlatformDependent(mapOf(platformData to DescriptorDocumentableSource(this)))
-    }
+    private fun MemberDescriptor.createSources(): SourceSetDependent<DocumentableSource> =
+        DescriptorDocumentableSource(this).toSourceSetDependent()
 
     private fun FunctionDescriptor.additionalExtras() = listOfNotNull(
         ExtraModifiers.DYNAMIC.takeIf { isDynamic() },
@@ -634,7 +622,7 @@ private class DokkaDescriptorVisitor(
     private fun ValueParameterDescriptor.getDefaultValue(): String? =
         (source as? KotlinSourceElement)?.psi?.children?.find { it is KtExpression }?.text
 
-    private data class ClassInfo(val supertypes: List<DRI>, val docs: PlatformDependent<DocumentationNode>)
+    private data class ClassInfo(val supertypes: List<DRI>, val docs: SourceSetDependent<DocumentationNode>)
 
     private fun Visibility.toDokkaVisibility(): org.jetbrains.dokka.model.Visibility = when (this) {
         Visibilities.PUBLIC -> KotlinVisibility.Public
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index 439da560..232f6721 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 import kotlin.reflect.KClass
 import kotlin.reflect.full.isSubclassOf
 
-private typealias GroupedTags = Map<KClass<out TagWrapper>, List<Pair<PlatformData?, TagWrapper>>>
+private typealias GroupedTags = Map<KClass<out TagWrapper>, List<Pair<SourceSetData?, TagWrapper>>>
 
 private val specialTags: Set<KClass<out TagWrapper>> =
     setOf(Property::class, Description::class, Constructor::class, Receiver::class, Param::class, See::class)
@@ -68,8 +68,8 @@ open class DefaultPageCreator(
             header(1) { text(m.name) }
         }
         +contentForComments(m)
-        block("Packages", 2, ContentKind.Packages, m.packages, m.platformData.toSet()) {
-            link(it.name, it.dri, kind = ContentKind.Main)
+        block("Packages", 2, ContentKind.Packages, m.packages, m.sourceSets.toSet()) {
+            link(it.name, it.dri)
         }
 //        text("Index\n") TODO
 //        text("Link to allpage here")
@@ -80,10 +80,10 @@ open class DefaultPageCreator(
             header(1) { text("Package ${p.name}") }
         }
         +contentForComments(p)
-        +contentForScope(p, p.dri, p.platformData)
-        block("Type aliases", 2, ContentKind.TypeAliases, p.typealiases, p.platformData.toSet()) {
+        +contentForScope(p, p.dri, p.sourceSets)
+        block("Type aliases", 2, ContentKind.TypeAliases, p.typealiases, p.sourceSets.toSet()) {
             link(it.name, it.dri, kind = ContentKind.Main)
-            platformDependentHint(it.dri, it.platformData.toSet(), kind = ContentKind.PlatformDependantHint) {
+            sourceSetDependentHint(it.dri, it.sourceSets.toSet(), kind = ContentKind.SourceSetDependantHint) {
                 +buildSignature(it)
                 contentForBrief(it)
             }
@@ -93,47 +93,47 @@ open class DefaultPageCreator(
     protected open fun contentForScope(
         s: WithScope,
         dri: DRI,
-        platformData: List<PlatformData>
+        sourceSets: List<SourceSetData>
     ) = contentBuilder.contentFor(s as Documentable) {
-        block("Types", 2, ContentKind.Classlikes, s.classlikes, platformData.toSet()) {
+        block("Types", 2, ContentKind.Classlikes, s.classlikes, sourceSets.toSet()) {
             link(it.name ?: "", it.dri, kind = ContentKind.Main)
-            platformDependentHint(it.dri, it.platformData.toSet(), kind = ContentKind.PlatformDependantHint) {
+            sourceSetDependentHint(it.dri, it.sourceSets.toSet(), kind = ContentKind.SourceSetDependantHint) {
                 +buildSignature(it)
                 contentForBrief(it)
             }
         }
-        block("Functions", 2, ContentKind.Functions, s.functions, platformData.toSet()) {
+        block("Functions", 2, ContentKind.Functions, s.functions, sourceSets.toSet()) {
             link(it.name, it.dri, kind = ContentKind.Main)
-            platformDependentHint(it.dri, it.platformData.toSet(), kind = ContentKind.PlatformDependantHint) {
+            sourceSetDependentHint(it.dri, it.sourceSets.toSet(), kind = ContentKind.SourceSetDependantHint) {
                 +buildSignature(it)
                 contentForBrief(it)
             }
         }
-        block("Properties", 2, ContentKind.Properties, s.properties, platformData.toSet()) {
+        block("Properties", 2, ContentKind.Properties, s.properties, sourceSets.toSet()) {
             link(it.name, it.dri, kind = ContentKind.Main)
-            platformDependentHint(it.dri, it.platformData.toSet(), kind = ContentKind.PlatformDependantHint) {
+            sourceSetDependentHint(it.dri, it.sourceSets.toSet(), kind = ContentKind.SourceSetDependantHint) {
                 +buildSignature(it)
 
                 contentForBrief(it)
             }
         }
         s.safeAs<WithExtraProperties<Documentable>>()?.let { it.extra[InheritorsInfo] }?.let { inheritors ->
-            val map = inheritors.value.map.filter { it.value.isNotEmpty() }
+            val map = inheritors.value.filter { it.value.isNotEmpty() }
             if (map.values.any()) {
                 header(2) { text("Inheritors") }
                 +ContentTable(
                     emptyList(),
                     map.entries.flatMap { entry -> entry.value.map { Pair(entry.key, it) } }
                         .groupBy({ it.second }, { it.first }).map { (classlike, platforms) ->
-                        buildGroup(dri, platforms.toSet(), ContentKind.Inheritors) {
-                            link(
-                                classlike.classNames?.substringBeforeLast(".") ?: classlike.toString()
-                                    .also { logger.warn("No class name found for DRI $classlike") }, classlike
-                            )
-                        }
-                    },
+                            buildGroup(dri, platforms.toSet(), ContentKind.Inheritors) {
+                                link(
+                                    classlike.classNames?.substringBeforeLast(".") ?: classlike.toString()
+                                        .also { logger.warn("No class name found for DRI $classlike") }, classlike
+                                )
+                            }
+                        },
                     DCI(setOf(dri), ContentKind.Inheritors),
-                    platformData.toSet(),
+                    sourceSets.toSet(),
                     style = emptySet()
                 )
             }
@@ -146,13 +146,13 @@ open class DefaultPageCreator(
             +buildSignature(e)
         }
         +contentForComments(e)
-        +contentForScope(e, e.dri, e.platformData)
+        +contentForScope(e, e.dri, e.sourceSets)
     }
 
     protected open fun contentForClasslike(c: DClasslike) = contentBuilder.contentFor(c) {
         group(kind = ContentKind.Cover) {
             header(1) { text(c.name.orEmpty()) }
-            platformDependentHint(c.dri, c.platformData.toSet()) {
+            sourceSetDependentHint(c.dri, c.sourceSets.toSet()) {
                 +buildSignature(c)
             }
         }
@@ -164,58 +164,57 @@ open class DefaultPageCreator(
                 2,
                 ContentKind.Constructors,
                 c.constructors.filter { it.extra[PrimaryConstructorExtra] == null },
-                c.platformData.toSet()
+                c.sourceSets.toSet()
             ) {
                 link(it.name, it.dri, kind = ContentKind.Main)
-                platformDependentHint(it.dri, it.platformData.toSet(), kind = ContentKind.PlatformDependantHint) {
+                sourceSetDependentHint(it.dri, it.sourceSets.toSet(), kind = ContentKind.SourceSetDependantHint) {
                     +buildSignature(it)
                     contentForBrief(it)
                 }
             }
         }
         if (c is DEnum) {
-            block("Entries", 2, ContentKind.Classlikes, c.entries, c.platformData.toSet()) {
+            block("Entries", 2, ContentKind.Classlikes, c.entries, c.sourceSets.toSet()) {
                 link(it.name, it.dri, kind = ContentKind.Main)
-                platformDependentHint(it.dri, it.platformData.toSet(), kind = ContentKind.PlatformDependantHint) {
+                sourceSetDependentHint(it.dri, it.sourceSets.toSet(), kind = ContentKind.SourceSetDependantHint) {
                     +buildSignature(it)
                     contentForBrief(it)
                 }
             }
         }
 
-        +contentForScope(c, c.dri, c.platformData)
+        +contentForScope(c, c.dri, c.sourceSets)
     }
 
     @Suppress("UNCHECKED_CAST")
-    private inline fun <reified T : TagWrapper> GroupedTags.withTypeUnnamed(): PlatformDependent<T> =
-        (this[T::class] as List<Pair<PlatformData, T>>?)
-            ?.let { PlatformDependent.from(it) }.orEmpty()
+    private inline fun <reified T : TagWrapper> GroupedTags.withTypeUnnamed(): SourceSetDependent<T> =
+        (this[T::class] as List<Pair<SourceSetData, T>>?)?.toMap().orEmpty()
 
     @Suppress("UNCHECKED_CAST")
-    private inline fun <reified T : NamedTagWrapper> GroupedTags.withTypeNamed(): Map<String, PlatformDependent<T>> =
-        (this[T::class] as List<Pair<PlatformData, T>>?)
+    private inline fun <reified T : NamedTagWrapper> GroupedTags.withTypeNamed(): Map<String, SourceSetDependent<T>> =
+        (this[T::class] as List<Pair<SourceSetData, T>>?)
             ?.groupBy { it.second.name }
-            ?.mapValues { (_, v) -> PlatformDependent.from(v) }
+            ?.mapValues { (_, v) -> v.toMap() }
             .orEmpty()
 
     private inline fun <reified T : TagWrapper> GroupedTags.isNotEmptyForTag(): Boolean =
-            this[T::class]?.isNotEmpty() ?: false
+        this[T::class]?.isNotEmpty() ?: false
 
     protected open fun contentForComments(
         d: Documentable
     ): List<ContentNode> {
-        val tags: GroupedTags = d.documentation.allEntries.flatMap { (pd, doc) ->
-            doc.children.asSequence().map { pd to it }
+        val tags: GroupedTags = d.documentation.flatMap { (pd, doc) ->
+            doc.children.asSequence().map { pd to it }.toList()
         }.groupBy { it.second::class }
 
-        val platforms = d.platformData
+        val platforms = d.sourceSets
 
         fun DocumentableContentBuilder.contentForDescription() {
             val description = tags.withTypeUnnamed<Description>()
             if (description.any { it.value.root.children.isNotEmpty() }) {
                 platforms.forEach { platform ->
-                    description.getOrExpect(platform)?.also {
-                        group(platformData = setOf(platform)) {
+                    description[platform]?.also {
+                        group(sourceSets = setOf(platform)) {
                             comment(it.root)
                         }
                     }
@@ -232,16 +231,16 @@ open class DefaultPageCreator(
                 }
                 table(kind = ContentKind.Parameters) {
                     platforms.flatMap { platform ->
-                        val receiverRow = receiver.getOrExpect(platform)?.let {
-                            buildGroup(platformData = setOf(platform), kind = ContentKind.Parameters, styles = mainStyles + ContentStyle.KeyValue) {
+                        val receiverRow = receiver[platform]?.let {
+                            buildGroup(sourceSets = setOf(platform), kind = ContentKind.Parameters, styles = mainStyles + ContentStyle.KeyValue) {
                                 text("<receiver>")
                                 comment(it.root)
                             }
                         }
 
                         val paramRows = params.mapNotNull { (_, param) ->
-                            param.getOrExpect(platform)?.let {
-                                buildGroup(platformData = setOf(platform), kind = ContentKind.Parameters, styles = mainStyles + ContentStyle.KeyValue) {
+                            param[platform]?.let {
+                                buildGroup(sourceSets = setOf(platform), kind = ContentKind.Parameters, styles = mainStyles + ContentStyle.KeyValue) {
                                     text(it.name, kind = ContentKind.Parameters)
                                     comment(it.root)
                                 }
@@ -263,8 +262,8 @@ open class DefaultPageCreator(
                 table(kind = ContentKind.Sample) {
                     platforms.flatMap { platform ->
                         seeAlsoTags.mapNotNull { (_, see) ->
-                            see.getOrExpect(platform)?.let {
-                                buildGroup(platformData = setOf(platform), kind = ContentKind.Comment, styles = mainStyles + ContentStyle.KeyValue) {
+                            see[platform]?.let {
+                                buildGroup(sourceSets = setOf(platform), kind = ContentKind.Comment, styles = mainStyles + ContentStyle.KeyValue) {
                                     if (it.address != null) link(it.name, it.address!!, kind = ContentKind.Comment)
                                     else text(it.name, kind = ContentKind.Comment)
                                     comment(it.root)
@@ -282,7 +281,7 @@ open class DefaultPageCreator(
                 platforms.forEach { platformData ->
                     val content = samples.filter { it.value.isEmpty() || platformData in it.value }
                     if (content.isNotEmpty()) {
-                        group(platformData = setOf(platformData)) {
+                        group(sourceSets = setOf(platformData)) {
                             header(4, kind = ContentKind.Comment) { text("Samples") }
                             content.forEach {
                                 comment(Text(it.key))
@@ -294,13 +293,13 @@ open class DefaultPageCreator(
         }
 
         fun DocumentableContentBuilder.contentForUnnamedTags() {
-            val unnamedTags: List<PlatformDependent<TagWrapper>> =
+            val unnamedTags: List<SourceSetDependent<TagWrapper>> =
                 tags.filterNot { (k, _) -> k.isSubclassOf(NamedTagWrapper::class) || k in specialTags }
-                    .map { (_, v) -> PlatformDependent.from(v) }
+                    .map { (_, v) -> v.mapNotNull { (k,v) -> k?.let { it to v } }.toMap() }
             platforms.forEach { platform ->
                 unnamedTags.forEach { pdTag ->
-                    pdTag.getOrExpect(platform)?.also { tag ->
-                        group(platformData = setOf(platform)) {
+                    pdTag[platform]?.also { tag ->
+                        group(sourceSets = setOf(platform)) {
                             header(4) { text(tag.toHeaderString()) }
                             comment(tag.root)
                         }
@@ -312,7 +311,7 @@ open class DefaultPageCreator(
         return contentBuilder.contentFor(d) {
             if (tags.isNotEmpty()) {
                 header(3) { text("Description") }
-                platformDependentHint(platformData = platforms.toSet()) {
+                sourceSetDependentHint(sourceSets = platforms.toSet()) {
                     contentForDescription()
                     contentForSamples()
                     contentForParams()
@@ -324,11 +323,11 @@ open class DefaultPageCreator(
     }
 
     protected open fun DocumentableContentBuilder.contentForBrief(content: Documentable) {
-        content.platformData.forEach { platform ->
+        content.sourceSets.forEach { platform ->
             val root = content.documentation[platform]?.children?.firstOrNull()?.root
 
             root?.let {
-                group(platformData = setOf(platform), kind = ContentKind.BriefComment) {
+                group(sourceSets = setOf(platform), kind = ContentKind.BriefComment) {
                     text(it.docTagSummary(), kind = ContentKind.Comment)
                 }
             }
@@ -338,7 +337,7 @@ open class DefaultPageCreator(
     protected open fun contentForFunction(f: DFunction) = contentBuilder.contentFor(f) {
         group(kind = ContentKind.Cover) {
             header(1) { text(f.name) }
-            platformDependentHint(f.dri, f.platformData.toSet()) {
+            sourceSetDependentHint(f.dri, f.sourceSets.toSet()) {
                 +buildSignature(f)
             }
         }
diff --git a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
index 6cb47b7f..3ed19afa 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
@@ -19,46 +19,46 @@ open class PageContentBuilder(
 ) {
     fun contentFor(
         dri: DRI,
-        platformData: Set<PlatformData>,
+        sourceSets: Set<SourceSetData>,
         kind: Kind = ContentKind.Main,
         styles: Set<Style> = emptySet(),
         extra: PropertyContainer<ContentNode> = PropertyContainer.empty(),
         block: DocumentableContentBuilder.() -> Unit
     ): ContentGroup =
-        DocumentableContentBuilder(dri, platformData, styles, extra)
+        DocumentableContentBuilder(dri, sourceSets, styles, extra)
             .apply(block)
-            .build(platformData, kind, styles, extra)
+            .build(sourceSets, kind, styles, extra)
 
     fun contentFor(
         d: Documentable,
         kind: Kind = ContentKind.Main,
         styles: Set<Style> = emptySet(),
         extra: PropertyContainer<ContentNode> = PropertyContainer.empty(),
-        platformData: Set<PlatformData> = d.platformData.toSet(),
+        sourceSets: Set<SourceSetData> = d.sourceSets.toSet(),
         block: DocumentableContentBuilder.() -> Unit = {}
     ): ContentGroup =
-        DocumentableContentBuilder(d.dri, platformData, styles, extra)
+        DocumentableContentBuilder(d.dri, sourceSets, styles, extra)
             .apply(block)
-            .build(platformData, kind, styles, extra)
+            .build(sourceSets, kind, styles, extra)
 
     @ContentBuilderMarker
     open inner class DocumentableContentBuilder(
         val mainDRI: DRI,
-        val mainPlatformData: Set<PlatformData>,
+        val mainPlatformData: Set<SourceSetData>,
         val mainStyles: Set<Style>,
         val mainExtra: PropertyContainer<ContentNode>
     ) {
         protected val contents = mutableListOf<ContentNode>()
 
         fun build(
-            platformData: Set<PlatformData>,
+            sourceSets: Set<SourceSetData>,
             kind: Kind,
             styles: Set<Style>,
             extra: PropertyContainer<ContentNode>
         ) = ContentGroup(
             contents.toList(),
             DCI(setOf(mainDRI), kind),
-            platformData,
+            sourceSets,
             styles,
             extra
         )
@@ -74,7 +74,7 @@ open class PageContentBuilder(
         fun header(
             level: Int,
             kind: Kind = ContentKind.Main,
-            platformData: Set<PlatformData> = mainPlatformData,
+            platformData: Set<SourceSetData> = mainPlatformData,
             styles: Set<Style> = mainStyles,
             extra: PropertyContainer<ContentNode> = mainExtra,
             block: DocumentableContentBuilder.() -> Unit
@@ -88,11 +88,11 @@ open class PageContentBuilder(
         fun text(
             text: String,
             kind: Kind = ContentKind.Main,
-            platformData: Set<PlatformData> = mainPlatformData,
+            sourceSets: Set<SourceSetData> = mainPlatformData,
             styles: Set<Style> = mainStyles,
             extra: PropertyContainer<ContentNode> = mainExtra
         ) {
-            contents += createText(text, kind, platformData, styles, extra)
+            contents += createText(text, kind, sourceSets, styles, extra)
         }
 
         fun buildSignature(d: Documentable) = signatureProvider.signature(d)
@@ -100,26 +100,26 @@ open class PageContentBuilder(
         fun linkTable(
             elements: List<DRI>,
             kind: Kind = ContentKind.Main,
-            platformData: Set<PlatformData> = mainPlatformData,
+            sourceSets: Set<SourceSetData> = mainPlatformData,
             styles: Set<Style> = mainStyles,
             extra: PropertyContainer<ContentNode> = mainExtra
         ) {
             contents += ContentTable(
                 emptyList(),
                 elements.map {
-                    contentFor(it, platformData, kind, styles, extra) {
+                    contentFor(it, sourceSets, kind, styles, extra) {
                         link(it.classNames ?: "", it)
                     }
                 },
                 DCI(setOf(mainDRI), kind),
-                platformData, styles, extra
+                sourceSets, styles, extra
             )
         }
 
         fun table(
             dri: DRI = mainDRI,
             kind: Kind = ContentKind.Main,
-            platformData: Set<PlatformData> = mainPlatformData,
+            sourceSets: Set<SourceSetData> = mainPlatformData,
             styles: Set<Style> = mainStyles,
             extra: PropertyContainer<ContentNode> = mainExtra,
             operation: DocumentableContentBuilder.() -> List<ContentGroup>
@@ -128,7 +128,7 @@ open class PageContentBuilder(
                 emptyList(),
                 operation(),
                 DCI(setOf(mainDRI), kind),
-                platformData, styles, extra
+                sourceSets, styles, extra
             )
         }
 
@@ -137,7 +137,7 @@ open class PageContentBuilder(
             level: Int,
             kind: Kind = ContentKind.Main,
             elements: Iterable<T>,
-            platformData: Set<PlatformData> = mainPlatformData,
+            sourceSets: Set<SourceSetData> = mainPlatformData,
             styles: Set<Style> = mainStyles,
             extra: PropertyContainer<ContentNode> = mainExtra,
             renderWhenEmpty: Boolean = false,
@@ -148,12 +148,12 @@ open class PageContentBuilder(
                 contents += ContentTable(
                     emptyList(),
                     elements.map {
-                        buildGroup(it.dri, it.platformData.toSet(), kind, styles, extra) {
+                        buildGroup(it.dri, it.sourceSets.toSet(), kind, styles, extra) {
                             operation(it)
                         }
                     },
                     DCI(setOf(mainDRI), kind),
-                    platformData, styles, extra
+                    sourceSets, styles, extra
                 )
             }
         }
@@ -163,17 +163,17 @@ open class PageContentBuilder(
             prefix: String = "",
             suffix: String = "",
             separator: String = ", ",
-            platformData: Set<PlatformData> = mainPlatformData, // TODO: children should be aware of this platform data
+            sourceSets: Set<SourceSetData> = mainPlatformData, // TODO: children should be aware of this platform data
             operation: DocumentableContentBuilder.(T) -> Unit
         ) {
             if (elements.isNotEmpty()) {
-                if (prefix.isNotEmpty()) text(prefix, platformData = platformData)
+                if (prefix.isNotEmpty()) text(prefix, sourceSets = sourceSets)
                 elements.dropLast(1).forEach {
                     operation(it)
-                    text(separator, platformData = platformData)
+                    text(separator, sourceSets = sourceSets)
                 }
                 operation(elements.last())
-                if (suffix.isNotEmpty()) text(suffix, platformData = platformData)
+                if (suffix.isNotEmpty()) text(suffix, sourceSets = sourceSets)
             }
         }
 
@@ -181,15 +181,15 @@ open class PageContentBuilder(
             text: String,
             address: DRI,
             kind: Kind = ContentKind.Main,
-            platformData: Set<PlatformData> = mainPlatformData,
+            sourceSets: Set<SourceSetData> = mainPlatformData,
             styles: Set<Style> = mainStyles,
             extra: PropertyContainer<ContentNode> = mainExtra
         ) {
             contents += ContentDRILink(
-                listOf(createText(text, kind, platformData, styles, extra)),
+                listOf(createText(text, kind, sourceSets, styles, extra)),
                 address,
                 DCI(setOf(mainDRI), kind),
-                platformData
+                sourceSets
             )
         }
 
@@ -197,99 +197,99 @@ open class PageContentBuilder(
             text: String,
             address: String,
             kind: Kind = ContentKind.Main,
-            platformData: Set<PlatformData> = mainPlatformData,
+            sourceSets: Set<SourceSetData> = mainPlatformData,
             styles: Set<Style> = mainStyles,
             extra: PropertyContainer<ContentNode> = mainExtra
         ) =
         ContentResolvedLink(
-            children = listOf(createText(text, kind, platformData, styles, extra)),
+            children = listOf(createText(text, kind, sourceSets, styles, extra)),
             address = address,
             extra = PropertyContainer.empty(),
             dci = DCI(setOf(mainDRI), kind),
-            platforms = platformData,
+            sourceSets = sourceSets,
             style = emptySet()
         )
 
         fun link(
             address: DRI,
             kind: Kind = ContentKind.Main,
-            platformData: Set<PlatformData> = mainPlatformData,
+            sourceSets: Set<SourceSetData> = mainPlatformData,
             styles: Set<Style> = mainStyles,
             extra: PropertyContainer<ContentNode> = mainExtra,
             block: DocumentableContentBuilder.() -> Unit
         ) {
             contents += ContentDRILink(
-                contentFor(mainDRI, platformData, kind, styles, extra, block).children,
+                contentFor(mainDRI, sourceSets, kind, styles, extra, block).children,
                 address,
                 DCI(setOf(mainDRI), kind),
-                platformData
+                sourceSets
             )
         }
 
         fun comment(
             docTag: DocTag,
             kind: Kind = ContentKind.Comment,
-            platformData: Set<PlatformData> = mainPlatformData,
+            sourceSets: Set<SourceSetData> = mainPlatformData,
             styles: Set<Style> = mainStyles,
             extra: PropertyContainer<ContentNode> = mainExtra
         ) {
             val content = commentsConverter.buildContent(
                 docTag,
                 DCI(setOf(mainDRI), kind),
-                platformData
+                sourceSets
             )
-            contents += ContentGroup(content, DCI(setOf(mainDRI), kind), platformData, styles, extra)
+            contents += ContentGroup(content, DCI(setOf(mainDRI), kind), sourceSets, styles, extra)
         }
 
         fun group(
             dri: DRI = mainDRI,
-            platformData: Set<PlatformData> = mainPlatformData,
+            sourceSets: Set<SourceSetData> = mainPlatformData,
             kind: Kind = ContentKind.Main,
             styles: Set<Style> = mainStyles,
             extra: PropertyContainer<ContentNode> = mainExtra,
             block: DocumentableContentBuilder.() -> Unit
         ) {
-            contents += buildGroup(dri, platformData, kind, styles, extra, block)
+            contents += buildGroup(dri, sourceSets, kind, styles, extra, block)
         }
 
         fun buildGroup(
             dri: DRI = mainDRI,
-            platformData: Set<PlatformData> = mainPlatformData,
+            sourceSets: Set<SourceSetData> = mainPlatformData,
             kind: Kind = ContentKind.Main,
             styles: Set<Style> = mainStyles,
             extra: PropertyContainer<ContentNode> = mainExtra,
             block: DocumentableContentBuilder.() -> Unit
-        ): ContentGroup = contentFor(dri, platformData, kind, styles, extra, block)
+        ): ContentGroup = contentFor(dri, sourceSets, kind, styles, extra, block)
 
-        fun platformDependentHint(
+        fun sourceSetDependentHint(
             dri: DRI = mainDRI,
-            platformData: Set<PlatformData> = mainPlatformData,
+            sourceSets: Set<SourceSetData> = mainPlatformData,
             kind: Kind = ContentKind.Main,
             styles: Set<Style> = mainStyles,
             extra: PropertyContainer<ContentNode> = mainExtra,
             block: DocumentableContentBuilder.() -> Unit
         ) {
             contents += PlatformHintedContent(
-                buildGroup(dri, platformData, kind, styles, extra, block),
-                platformData
+                buildGroup(dri, sourceSets, kind, styles, extra, block),
+                sourceSets
             )
         }
 
         protected fun createText(
             text: String,
             kind: Kind,
-            platformData: Set<PlatformData>,
+            sourceSets: Set<SourceSetData>,
             styles: Set<Style>,
             extra: PropertyContainer<ContentNode>
         ) =
-            ContentText(text, DCI(setOf(mainDRI), kind), platformData, styles, extra)
+            ContentText(text, DCI(setOf(mainDRI), kind), sourceSets, styles, extra)
 
         fun <T> platformText(
-            value: PlatformDependent<T>,
-            platforms: Set<PlatformData> = value.keys,
+            value: SourceSetDependent<T>,
+            platforms: Set<SourceSetData> = value.keys,
             transform: (T) -> String
         ) = value.entries.filter { it.key in platforms }.forEach { (p, v) ->
-            transform(v).takeIf { it.isNotBlank() }?.also { text(it, platformData = setOf(p)) }
+            transform(v).takeIf { it.isNotBlank() }?.also { text(it, sourceSets = setOf(p)) }
         }
     }
 }
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
index e5fa4bfc..ca8055c8 100644
--- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
@@ -9,7 +9,6 @@ import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.links.withClass
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.properties.PropertyContainer
-import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.transformers.sources.SourceToDocumentableTranslator
 import org.jetbrains.dokka.utilities.DokkaLogger
@@ -23,16 +22,21 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.psiUtil.getChildOfType
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
+import java.io.File
 
 object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
 
-    override fun invoke(platformData: PlatformData, context: DokkaContext): DModule {
+    override fun invoke(sourceSetData: SourceSetData, context: DokkaContext): DModule {
 
-        val (environment, _) = context.platforms.getValue(platformData)
+        fun isFileInSourceRoots(file: File) : Boolean {
+            return sourceSetData.sourceRoots.any { root -> file.path.startsWith(File(root.path).absolutePath) }
+        }
+
+        val (environment, _) = context.platforms.getValue(sourceSetData)
 
         val sourceRoots = environment.configuration.get(CLIConfigurationKeys.CONTENT_ROOTS)
             ?.filterIsInstance<JavaSourceRoot>()
-            ?.map { it.file }
+            ?.mapNotNull { it.file.takeIf(::isFileInSourceRoots) }
             ?: listOf()
         val localFileSystem = VirtualFileManager.getInstance().getFileSystem("file")
 
@@ -46,11 +50,11 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
 
         val docParser =
             DokkaPsiParser(
-                platformData,
+                sourceSetData,
                 context.logger
             )
         return DModule(
-            platformData.name,
+            sourceSetData.moduleName,
             psiFiles.mapNotNull { it.safeAs<PsiJavaFile>() }.groupBy { it.packageName }.map { (packageName, psiFiles) ->
                 val dri = DRI(packageName = packageName)
                 DPackage(
@@ -61,17 +65,19 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                         psiFile.classes.map { docParser.parseClasslike(it, dri) }
                     },
                     emptyList(),
-                    PlatformDependent.empty(),
-                    listOf(platformData)
+                    emptyMap(),
+                    null,
+                    listOf(sourceSetData)
                 )
             },
-            PlatformDependent.empty(),
-            listOf(platformData)
+            emptyMap(),
+            null,
+            listOf(sourceSetData)
         )
     }
 
     class DokkaPsiParser(
-        private val platformData: PlatformData,
+        private val sourceSetData: SourceSetData,
         private val logger: DokkaLogger
     ) {
 
@@ -104,7 +110,7 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
         }
 
         private fun <T> T.toPlatformDependant() =
-            PlatformDependent(mapOf(platformData to this))
+            mapOf(sourceSetData to this)
 
         fun parseClasslike(psi: PsiClass, parent: DRI): DClasslike = with(psi) {
             val dri = parent.withClass(name.toString())
@@ -145,6 +151,7 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                         name.orEmpty(),
                         dri,
                         documentation,
+                        null,
                         source,
                         allFunctions,
                         fields.mapNotNull { parseField(it, accessors[it].orEmpty()) },
@@ -152,7 +159,7 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                         visibility,
                         null,
                         constructors.map { parseFunction(it, true) },
-                        listOf(platformData),
+                        listOf(sourceSetData),
                         PropertyContainer.empty<DAnnotation>() + annotations.toList().toExtra()
                     )
                 isEnum -> DEnum(
@@ -163,14 +170,16 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                             dri.withClass("$name.${entry.name}"),
                             entry.name.orEmpty(),
                             javadocParser.parseDocumentation(entry).toPlatformDependant(),
+                            null,
                             emptyList(),
                             emptyList(),
                             emptyList(),
-                            listOf(platformData),
+                            listOf(sourceSetData),
                             PropertyContainer.empty<DEnumEntry>() + entry.annotations.toList().toExtra()
                         )
                     },
                     documentation,
+                    null,
                     source,
                     allFunctions,
                     fields.filter { it !is PsiEnumConstant }.map { parseField(it, accessors[it].orEmpty()) },
@@ -179,13 +188,14 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                     null,
                     constructors.map { parseFunction(it, true) },
                     ancestors,
-                    listOf(platformData),
+                    listOf(sourceSetData),
                     PropertyContainer.empty<DEnum>() + annotations.toList().toExtra()
                 )
                 isInterface -> DInterface(
                     dri,
                     name.orEmpty(),
                     documentation,
+                    null,
                     source,
                     allFunctions,
                     fields.mapNotNull { parseField(it, accessors[it].orEmpty()) },
@@ -194,7 +204,7 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                     null,
                     mapTypeParameters(dri),
                     ancestors,
-                    listOf(platformData),
+                    listOf(sourceSetData),
                     PropertyContainer.empty<DInterface>() + annotations.toList().toExtra()
                 )
                 else -> DClass(
@@ -210,8 +220,9 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                     mapTypeParameters(dri),
                     ancestors,
                     documentation,
+                    null,
                     modifiers,
-                    listOf(platformData),
+                    listOf(sourceSetData),
                     PropertyContainer.empty<DClass>() + annotations.toList().toExtra()
                 )
             }
@@ -232,18 +243,20 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                         dri.copy(target = index + 1),
                         psiParameter.name,
                         javadocParser.parseDocumentation(psiParameter).toPlatformDependant(),
+                        null,
                         getBound(psiParameter.type),
-                        listOf(platformData)
+                        listOf(sourceSetData)
                     )
                 },
                 javadocParser.parseDocumentation(psi).toPlatformDependant(),
+                null,
                 PsiDocumentableSource(psi).toPlatformDependant(),
                 psi.getVisibility().toPlatformDependant(),
                 psi.returnType?.let { getBound(type = it) } ?: Void,
                 psi.mapTypeParameters(dri),
                 null,
                 psi.getModifier().toPlatformDependant(),
-                listOf(platformData),
+                listOf(sourceSetData),
                 PropertyContainer.withAll(
                     InheritedFunction(isInherited),
                     psi.annotations.toList().toExtra(),
@@ -313,8 +326,9 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                     dri.copy(genericTarget = index),
                     type.name.orEmpty(),
                     javadocParser.parseDocumentation(type).toPlatformDependant(),
+                    null,
                     mapBounds(type.bounds),
-                    listOf(platformData)
+                    listOf(sourceSetData)
                 )
             }
         }
@@ -349,6 +363,7 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                 dri,
                 psi.name!!, // TODO: Investigate if this is indeed nullable
                 javadocParser.parseDocumentation(psi).toPlatformDependant(),
+                null,
                 PsiDocumentableSource(psi).toPlatformDependant(),
                 psi.getVisibility().toPlatformDependant(),
                 getBound(psi.type),
@@ -356,7 +371,7 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                 accessors.firstOrNull { it.hasParameters() }?.let { parseFunction(it) },
                 accessors.firstOrNull { it.returnType == psi.type }?.let { parseFunction(it) },
                 psi.getModifier().toPlatformDependant(),
-                listOf(platformData),
+                listOf(sourceSetData),
                 emptyList(),
                 PropertyContainer.empty<DProperty>() + psi.annotations.toList().toExtra()
             )
diff --git a/plugins/base/src/test/kotlin/expect/AbstractExpectTest.kt b/plugins/base/src/test/kotlin/expect/AbstractExpectTest.kt
index ef97b04c..3b69a54e 100644
--- a/plugins/base/src/test/kotlin/expect/AbstractExpectTest.kt
+++ b/plugins/base/src/test/kotlin/expect/AbstractExpectTest.kt
@@ -17,7 +17,7 @@ abstract class AbstractExpectTest(
             format = outFormat
             passes {
                 pass {
-                    sourceRoots = listOf(path.asString())
+                    sourceRoots = listOf(path.toAbsolutePath().asString())
                 }
             }
         }
diff --git a/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt b/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt
index bf1d52d8..1299bf80 100644
--- a/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt
+++ b/plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt
@@ -29,6 +29,7 @@ class LinkableContentTest : AbstractCoreTest() {
                     sourceRoots = listOf("jsMain", "commonMain", "jvmAndJsSecondCommonMain").map {
                         "$testDataDir/$it/kotlin"
                     }
+                    sourceSetName = "js"
                     includes = listOf("$includesDir/include2.md")
                 }
                 pass {
@@ -38,6 +39,7 @@ class LinkableContentTest : AbstractCoreTest() {
                     sourceRoots = listOf("jvmMain", "commonMain", "jvmAndJsSecondCommonMain").map {
                         "$testDataDir/$it/kotlin"
                     }
+                    sourceSetName = "jvm"
                     includes = listOf("$includesDir/include1.md")
                 }
             }
@@ -73,6 +75,7 @@ class LinkableContentTest : AbstractCoreTest() {
                             lineSuffix = "#L"
                         )
                     )
+                    sourceSetName = "js"
                 }
                 pass {
                     moduleName = "example"
@@ -86,6 +89,7 @@ class LinkableContentTest : AbstractCoreTest() {
                             lineSuffix = "#L"
                         )
                     )
+                    sourceSetName = "jvm"
                 }
             }
         }
@@ -129,6 +133,7 @@ class LinkableContentTest : AbstractCoreTest() {
                     analysisPlatform = "js"
                     targets = listOf("js")
                     sourceRoots = listOf("$testDataDir/jsMain/kotlin")
+                    sourceSetName = "js"
                     samples = listOf("$testDataDir/jsMain/resources/Samples.kt")
                 }
                 pass {
@@ -136,6 +141,7 @@ class LinkableContentTest : AbstractCoreTest() {
                     analysisPlatform = "jvm"
                     targets = listOf("jvm")
                     sourceRoots = listOf("$testDataDir/jvmMain/kotlin")
+                    sourceSetName = "jvm"
                     samples = listOf("$testDataDir/jvmMain/resources/Samples.kt")
                 }
             }
diff --git a/plugins/base/src/test/kotlin/model/ClassesTest.kt b/plugins/base/src/test/kotlin/model/ClassesTest.kt
index ee109ba1..a349e54a 100644
--- a/plugins/base/src/test/kotlin/model/ClassesTest.kt
+++ b/plugins/base/src/test/kotlin/model/ClassesTest.kt
@@ -1,9 +1,7 @@
 package model
 
-import org.jetbrains.dokka.Platform
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.KotlinModifier.*
-import org.jetbrains.dokka.pages.PlatformData
 import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Test
 import utils.AbstractModelTest
@@ -169,7 +167,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
         ) {
             with((this / "classes" / "Klass").cast<DClass>()) {
                 name equals "Klass"
-                modifier.allValues.forEach { it equals Sealed }
+                modifier.values.forEach { it equals Sealed }
             }
         }
     }
@@ -211,15 +209,15 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             val D = (this / "classes" / "D").cast<DClass>()
 
             with(C) {
-                modifier.allValues.forEach { it equals Open }
+                modifier.values.forEach { it equals Open }
                 with((this / "f").cast<DFunction>()) {
-                    modifier.allValues.forEach { it equals Open }
+                    modifier.values.forEach { it equals Open }
                 }
             }
             with(D) {
-                modifier.allValues.forEach { it equals Final }
+                modifier.values.forEach { it equals Final }
                 with((this / "f").cast<DFunction>()) {
-                    modifier.allValues.forEach { it equals Open }
+                    modifier.values.forEach { it equals Open }
                 }
                 D.supertypes.flatMap { it.component2() }.firstOrNull() equals C.dri
             }
@@ -246,16 +244,16 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             val E = (this / "classes" / "E").cast<DClass>()
 
             with(C) {
-                modifier.allValues.forEach { it equals Abstract }
-                ((this / "foo").cast<DFunction>()).modifier.allValues.forEach { it equals Abstract }
+                modifier.values.forEach { it equals Abstract }
+                ((this / "foo").cast<DFunction>()).modifier.values.forEach { it equals Abstract }
             }
 
             with(D) {
-                modifier.allValues.forEach { it equals Abstract }
+                modifier.values.forEach { it equals Abstract }
             }
 
             with(E) {
-                modifier.allValues.forEach { it equals Final }
+                modifier.values.forEach { it equals Final }
 
             }
             D.supers.firstOrNull() equals C.dri
diff --git a/plugins/base/src/test/kotlin/model/InheritorsTest.kt b/plugins/base/src/test/kotlin/model/InheritorsTest.kt
index ee445b5d..ce8a87ca 100644
--- a/plugins/base/src/test/kotlin/model/InheritorsTest.kt
+++ b/plugins/base/src/test/kotlin/model/InheritorsTest.kt
@@ -30,8 +30,8 @@ class InheritorsTest : AbstractModelTest("/src/main/kotlin/inheritors/Test.kt",
             pluginsOverrides = listOf(InheritorsPlugin)
         ) {
             with((this / "inheritors" / "A").cast<DInterface>()) {
-                val map = extra[InheritorsInfo].assertNotNull("InheritorsInfo").value.map
-                with(map.keys.also { it counts 1 }.find { it.platformType == Platform.jvm }.assertNotNull("jvm key").let { map[it]!! }
+                val map = extra[InheritorsInfo].assertNotNull("InheritorsInfo").value
+                with(map.keys.also { it counts 1 }.find { it.platform == Platform.jvm }.assertNotNull("jvm key").let { map[it]!! }
                 ) {
                     this counts 1
                     first().classNames equals "B"
@@ -77,13 +77,13 @@ class InheritorsTest : AbstractModelTest("/src/main/kotlin/inheritors/Test.kt",
         ) {
             documentablesTransformationStage = { m ->
                 with((m / "inheritors" / "A").cast<DInterface>()) {
-                    val map = extra[InheritorsInfo].assertNotNull("InheritorsInfo").value.map
+                    val map = extra[InheritorsInfo].assertNotNull("InheritorsInfo").value
                     with(map.keys.also { it counts 2 }) {
-                        with(find { it.platformType == Platform.jvm }.assertNotNull("jvm key").let { map[it]!! }) {
+                        with(find { it.platform == Platform.jvm }.assertNotNull("jvm key").let { map[it]!! }) {
                             this counts 1
                             first().classNames equals "B"
                         }
-                        with(find { it.platformType == Platform.js }.assertNotNull("js key").let { map[it]!! }) {
+                        with(find { it.platform == Platform.js }.assertNotNull("js key").let { map[it]!! }) {
                             this counts 2
                             val classes = listOf("B", "C")
                             assertTrue(all { classes.contains(it.classNames) }, "One of subclasses missing in js" )
diff --git a/plugins/base/src/test/kotlin/model/JavaTest.kt b/plugins/base/src/test/kotlin/model/JavaTest.kt
index 20543c8f..a58b380c 100644
--- a/plugins/base/src/test/kotlin/model/JavaTest.kt
+++ b/plugins/base/src/test/kotlin/model/JavaTest.kt
@@ -112,7 +112,7 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             with((this / "java" / "Foo").cast<DClass>()) {
                 val sups = listOf("Exception", "Cloneable")
                 assertTrue(
-                    sups.all { s -> supertypes.map.values.flatten().any { it.classNames == s } })
+                    sups.all { s -> supertypes.values.flatten().any { it.classNames == s } })
                 "Foo must extend ${sups.joinToString(", ")}"
             }
         }
@@ -410,7 +410,7 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
                 val dri = (this / "Bar").assertNotNull("Foo dri").dri
                 with((this / "Foo").cast<DClass>()) {
                     with(extra[InheritorsInfo].assertNotNull("InheritorsInfo")) {
-                        with(value.map.values.flatten().distinct()) {
+                        with(value.values.flatten().distinct()) {
                             this counts 1
                             first() equals dri
                         }
diff --git a/plugins/base/src/test/kotlin/model/PackagesTest.kt b/plugins/base/src/test/kotlin/model/PackagesTest.kt
index 11d456ce..676f034a 100644
--- a/plugins/base/src/test/kotlin/model/PackagesTest.kt
+++ b/plugins/base/src/test/kotlin/model/PackagesTest.kt
@@ -14,8 +14,8 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac
             """.trimIndent(),
             prependPackage = false
         ) {
-            with((this / "[jvm root]").cast<DPackage>()) {
-                name equals "[jvm root]"
+            with((this / "[main root]").cast<DPackage>()) {
+                name equals "[main root]"
                 children counts 0
             }
         }
diff --git a/plugins/base/src/test/kotlin/renderers/RenderingOnlyTestBase.kt b/plugins/base/src/test/kotlin/renderers/RenderingOnlyTestBase.kt
index 237f4fd9..dd4d1ee0 100644
--- a/plugins/base/src/test/kotlin/renderers/RenderingOnlyTestBase.kt
+++ b/plugins/base/src/test/kotlin/renderers/RenderingOnlyTestBase.kt
@@ -14,6 +14,8 @@ import org.jetbrains.dokka.base.transformers.pages.samples.DefaultSamplesTransfo
 import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.model.Documentable
+import org.jetbrains.dokka.model.SourceSetCache
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.model.doc.DocTag
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.dokka.pages.*
@@ -34,6 +36,7 @@ abstract class RenderingOnlyTestBase {
         DokkaBase().htmlPreprocessors to { _ -> RootCreator },
         DokkaBase().externalLocationProviderFactory to { _ -> ::JavadocExternalLocationProviderFactory },
         DokkaBase().externalLocationProviderFactory to { _ -> ::DokkaExternalLocationProviderFactory },
+        sourceSetCache = SourceSetCache(),
         testConfiguration = DokkaConfigurationImpl("", "", false, null, emptyList(), emptyList(), emptyList(), emptyMap())
     )
 
@@ -105,7 +108,7 @@ internal object EmptyCommentConverter : CommentsToContentConverter {
     override fun buildContent(
         docTag: DocTag,
         dci: DCI,
-        platforms: Set<PlatformData>,
+        sourceSets: Set<SourceSetData>,
         styles: Set<Style>,
         extras: PropertyContainer<ContentNode>
     ): List<ContentNode> = emptyList()
@@ -113,7 +116,7 @@ internal object EmptyCommentConverter : CommentsToContentConverter {
 
 internal object EmptyLocationProviderFactory: LocationProviderFactory {
     override fun getLocationProvider(pageNode: RootPageNode) = object : LocationProvider {
-        override fun resolve(dri: DRI, platforms: List<PlatformData>, context: PageNode?): String = ""
+        override fun resolve(dri: DRI, sourceSets: List<SourceSetData>, context: PageNode?): String = ""
 
         override fun resolve(node: PageNode, context: PageNode?, skipExtension: Boolean): String = node.name
 
diff --git a/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt b/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt
deleted file mode 100644
index cf1ac0a9..00000000
--- a/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt
+++ /dev/null
@@ -1,120 +0,0 @@
-package renderers.html
-
-import org.jetbrains.dokka.Platform
-import org.jetbrains.dokka.base.renderers.html.HtmlRenderer
-import org.jetbrains.dokka.pages.PlatformData
-import org.jetbrains.dokka.pages.TextStyle
-import org.junit.jupiter.api.Test
-import renderers.Div
-import renderers.RenderingOnlyTestBase
-import renderers.TestPage
-import renderers.match
-
-class PlatformDependentHintTest : RenderingOnlyTestBase() {
-    private val pl1 = PlatformData("pl1", Platform.js, listOf("pl1"))
-    private val pl2 = PlatformData("pl2", Platform.jvm, listOf("pl2"))
-    private val pl3 = PlatformData("pl3", Platform.native, listOf("pl3"))
-
-    @Test
-    fun platformIndependentCase() {
-        val page = TestPage {
-            platformDependentHint(platformData = setOf(pl1, pl2, pl3), styles = setOf(TextStyle.Block)) {
-                text("a")
-                text("b")
-                text("c")
-            }
-        }
-
-        HtmlRenderer(context).render(page)
-        renderedContent.match(Div(Div(Div("abc"))))
-    }
-
-    @Test
-    fun completelyDivergentCase() {
-        val page = TestPage {
-            platformDependentHint(platformData = setOf(pl1, pl2, pl3), styles = setOf(TextStyle.Block)) {
-                text("a", platformData = setOf(pl1))
-                text("b", platformData = setOf(pl2))
-                text("c", platformData = setOf(pl3))
-            }
-        }
-
-        HtmlRenderer(context).render(page)
-        renderedContent.match(Div(Div(Div("a")), Div(Div("b")), Div(Div("c"))))
-    }
-
-    @Test
-    fun overlappingCase() {
-        val page = TestPage {
-            platformDependentHint(platformData = setOf(pl1, pl2), styles = setOf(TextStyle.Block)) {
-                text("a", platformData = setOf(pl1))
-                text("b", platformData = setOf(pl1, pl2))
-                text("c", platformData = setOf(pl2))
-            }
-        }
-
-        HtmlRenderer(context).render(page)
-        renderedContent.match(Div(Div(Div("ab")), Div(Div("bc"))))
-    }
-
-    @Test
-    fun caseThatCanBeSimplified() {
-        val page = TestPage {
-            platformDependentHint(platformData = setOf(pl1, pl2), styles = setOf(TextStyle.Block)) {
-                text("a", platformData = setOf(pl1, pl2))
-                text("b", platformData = setOf(pl1))
-                text("b", platformData = setOf(pl2))
-            }
-        }
-
-        HtmlRenderer(context).render(page)
-        renderedContent.match(Div(Div(Div("ab"))))
-    }
-
-    @Test
-    fun caseWithGroupBreakingSimplification() {
-        val page = TestPage {
-            platformDependentHint(platformData = setOf(pl1, pl2), styles = setOf(TextStyle.Block)) {
-                group(styles = setOf(TextStyle.Block)) {
-                    text("a", platformData = setOf(pl1, pl2))
-                    text("b", platformData = setOf(pl1))
-                }
-                text("b", platformData = setOf(pl2))
-            }
-        }
-
-        HtmlRenderer(context).render(page)
-        renderedContent.match(Div(Div(Div(Div("ab"))), Div(Div(Div("a"), "b"))))
-    }
-
-    @Test
-    fun caseWithGroupNotBreakingSimplification() {
-        val page = TestPage {
-            platformDependentHint(platformData = setOf(pl1, pl2)) {
-                group {
-                    text("a", platformData = setOf(pl1, pl2))
-                    text("b", platformData = setOf(pl1))
-                }
-                text("b", platformData = setOf(pl2))
-            }
-        }
-
-        HtmlRenderer(context).render(page)
-        println(renderedContent)
-        renderedContent.match(Div(Div("ab")))
-    }
-
-    @Test
-    fun partiallyUnifiedCase() {
-        val page = TestPage {
-            platformDependentHint(platformData = setOf(pl1, pl2, pl3), styles = setOf(TextStyle.Block)) {
-                text("a", platformData = setOf(pl1))
-                text("a", platformData = setOf(pl2))
-                text("b", platformData = setOf(pl3))
-            }
-        }
-
-        HtmlRenderer(context).render(page)
-        renderedContent.match(Div(Div(Div("a")), Div(Div("b"))))
-    }
-}
\ No newline at end of file
diff --git a/plugins/base/src/test/kotlin/renderers/html/SourceSetDependentHintTest.kt b/plugins/base/src/test/kotlin/renderers/html/SourceSetDependentHintTest.kt
new file mode 100644
index 00000000..f774a09b
--- /dev/null
+++ b/plugins/base/src/test/kotlin/renderers/html/SourceSetDependentHintTest.kt
@@ -0,0 +1,121 @@
+package renderers.html
+
+import org.jetbrains.dokka.Platform
+import org.jetbrains.dokka.SourceRootImpl
+import org.jetbrains.dokka.base.renderers.html.HtmlRenderer
+import org.jetbrains.dokka.model.SourceSetData
+import org.jetbrains.dokka.pages.TextStyle
+import org.junit.jupiter.api.Test
+import renderers.Div
+import renderers.RenderingOnlyTestBase
+import renderers.TestPage
+import renderers.match
+
+class SourceSetDependentHintTest : RenderingOnlyTestBase() {
+    private val pl1 = SourceSetData("root", "pl1", Platform.js, listOf(SourceRootImpl("pl1")))
+    private val pl2 = SourceSetData("root","pl2", Platform.jvm, listOf(SourceRootImpl("pl1")))
+    private val pl3 = SourceSetData("root","pl3", Platform.native, listOf(SourceRootImpl("pl1")))
+
+    @Test
+    fun platformIndependentCase() {
+        val page = TestPage {
+            sourceSetDependentHint(sourceSets = setOf(pl1, pl2, pl3), styles = setOf(TextStyle.Block)) {
+                text("a")
+                text("b")
+                text("c")
+            }
+        }
+
+        HtmlRenderer(context).render(page)
+        renderedContent.match(Div(Div(Div("abc"))))
+    }
+
+    @Test
+    fun completelyDivergentCase() {
+        val page = TestPage {
+            sourceSetDependentHint(sourceSets = setOf(pl1, pl2, pl3), styles = setOf(TextStyle.Block)) {
+                text("a", sourceSets = setOf(pl1))
+                text("b", sourceSets = setOf(pl2))
+                text("c", sourceSets = setOf(pl3))
+            }
+        }
+
+        HtmlRenderer(context).render(page)
+        renderedContent.match(Div(Div(Div("a")), Div(Div("b")), Div(Div("c"))))
+    }
+
+    @Test
+    fun overlappingCase() {
+        val page = TestPage {
+            sourceSetDependentHint(sourceSets = setOf(pl1, pl2), styles = setOf(TextStyle.Block)) {
+                text("a", sourceSets = setOf(pl1))
+                text("b", sourceSets = setOf(pl1, pl2))
+                text("c", sourceSets = setOf(pl2))
+            }
+        }
+
+        HtmlRenderer(context).render(page)
+        renderedContent.match(Div(Div(Div("ab")), Div(Div("bc"))))
+    }
+
+    @Test
+    fun caseThatCanBeSimplified() {
+        val page = TestPage {
+            sourceSetDependentHint(sourceSets = setOf(pl1, pl2), styles = setOf(TextStyle.Block)) {
+                text("a", sourceSets = setOf(pl1, pl2))
+                text("b", sourceSets = setOf(pl1))
+                text("b", sourceSets = setOf(pl2))
+            }
+        }
+
+        HtmlRenderer(context).render(page)
+        renderedContent.match(Div(Div(Div("ab"))))
+    }
+
+    @Test
+    fun caseWithGroupBreakingSimplification() {
+        val page = TestPage {
+            sourceSetDependentHint(sourceSets = setOf(pl1, pl2), styles = setOf(TextStyle.Block)) {
+                group(styles = setOf(TextStyle.Block)) {
+                    text("a", sourceSets = setOf(pl1, pl2))
+                    text("b", sourceSets = setOf(pl1))
+                }
+                text("b", sourceSets = setOf(pl2))
+            }
+        }
+
+        HtmlRenderer(context).render(page)
+        renderedContent.match(Div(Div(Div(Div("ab"))), Div(Div(Div("a"), "b"))))
+    }
+
+    @Test
+    fun caseWithGroupNotBreakingSimplification() {
+        val page = TestPage {
+            sourceSetDependentHint(sourceSets = setOf(pl1, pl2)) {
+                group {
+                    text("a", sourceSets = setOf(pl1, pl2))
+                    text("b", sourceSets = setOf(pl1))
+                }
+                text("b", sourceSets = setOf(pl2))
+            }
+        }
+
+        HtmlRenderer(context).render(page)
+        println(renderedContent)
+        renderedContent.match(Div(Div("ab")))
+    }
+
+    @Test
+    fun partiallyUnifiedCase() {
+        val page = TestPage {
+            sourceSetDependentHint(sourceSets = setOf(pl1, pl2, pl3), styles = setOf(TextStyle.Block)) {
+                text("a", sourceSets = setOf(pl1))
+                text("a", sourceSets = setOf(pl2))
+                text("b", sourceSets = setOf(pl3))
+            }
+        }
+
+        HtmlRenderer(context).render(page)
+        renderedContent.match(Div(Div(Div("a")), Div(Div("b"))))
+    }
+}
\ No newline at end of file
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html
index 35fe78dc..29daddec 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
-    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[main root]/////">
+    <div class="overview"><a href="root/[main root]/index.html">[main root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#//">
-      <div class="overview"><a href="root/[jvm root]/f.html">f</a></div>
+      <div class="overview"><a href="root/[main root]/f.html">f</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/f.html
deleted file mode 100644
index 6ca7daa7..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/f.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>f</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//f/#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div>
-          <div class="cover ">
-            <h1>f</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/index.html
deleted file mode 100644
index d1b41977..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/index.html	
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>[jvm root]</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
-          <div class="cover ">
-            <h1>Package [jvm root]</h1>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="f.html">f</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[main root]/f.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[main root]/f.html
new file mode 100644
index 00000000..8044ccbf
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[main root]/f.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>f</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//f/#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a>/<a href="f.html">f</a></div>
+          <div class="cover ">
+            <h1>f</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[main root]/index.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[main root]/index.html
new file mode 100644
index 00000000..9668ba81
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[main root]/index.html	
@@ -0,0 +1,50 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>[main root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a></div>
+          <div class="cover ">
+            <h1>Package [main root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="f.html">f</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html
index 2c55944d..2b62b11c 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html
@@ -27,9 +27,9 @@
           <div class="table">
             <div class="table-row">
               <div class="main-subrow">
-                <div class="title"><a href="[jvm root]/index.html">[jvm root]</a></div>
+                <div class="title"><a href="[main root]/index.html">[main root]</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/package-list
index 8f1c5fd9..aed2a34c 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://f/#//root/[jvm root]/f.html
-[jvm root]
+$dokka.location://f/#//root/[main root]/f.html
+[main root]
 
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/pages.js
new file mode 100644
index 00000000..e69de29b
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/navigation.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/navigation.html
index a7486efc..0a2d2041 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/navigation.html
@@ -1,12 +1,12 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
-    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-    <div class="sideMenuPart" id="nav-submenu-0-0" pageId="[jvm root]/Fancy////">
-      <div class="overview"><a href="root/[jvm root]/-fancy/index.html">Fancy</a></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[main root]/////">
+    <div class="overview"><a href="root/[main root]/index.html">[main root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+    <div class="sideMenuPart" id="nav-submenu-0-0" pageId="[main root]/Fancy////">
+      <div class="overview"><a href="root/[main root]/-fancy/index.html">Fancy</a></div>
     </div>
     <div class="sideMenuPart" id="nav-submenu-0-1" pageId="//f/#//">
-      <div class="overview"><a href="root/[jvm root]/f.html">f</a></div>
+      <div class="overview"><a href="root/[main root]/f.html">f</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/-init-.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/-init-.html
deleted file mode 100644
index 6e578700..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/-init-.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>&lt;init&gt;</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/Fancy/&lt;init&gt;/#kotlin.Int//">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="-init-.html">&lt;init&gt;</a></div>
-          <div class="cover ">
-            <h1>&lt;init&gt;</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="-init-.html">&lt;init&gt;</a>(size: <a href="">Int</a>)</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/equals.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/equals.html
deleted file mode 100644
index 52566473..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/equals.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>equals</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="/Fancy/equals/#kotlin.Any?//">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="equals.html">equals</a></div>
-          <div class="cover ">
-            <h1>equals</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/hash-code.html
deleted file mode 100644
index 98338519..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/hash-code.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>hashCode</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="/Fancy/hashCode/#//">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="hash-code.html">hashCode</a></div>
-          <div class="cover ">
-            <h1>hashCode</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html
deleted file mode 100644
index 6ff4bf1e..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html	
+++ /dev/null
@@ -1,102 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>Fancy</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/Fancy////">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a></div>
-          <div class="cover ">
-            <h1>Fancy</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">annotation class <a href="index.html">Fancy</a></div></div></div>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="equals.html">equals</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div></div>
-                </div>
-              </div>
-            </div>
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="hash-code.html">hashCode</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div></div>
-                </div>
-              </div>
-            </div>
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="to-string.html">toString</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <h2>Properties</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="">size</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final val <a href="">size</a>: <a href="">Int</a></div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/to-string.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/to-string.html
deleted file mode 100644
index b64fcf93..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/to-string.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>toString</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="/Fancy/toString/#//">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="to-string.html">toString</a></div>
-          <div class="cover ">
-            <h1>toString</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/f.html
deleted file mode 100644
index 6ca7daa7..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/f.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>f</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//f/#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div>
-          <div class="cover ">
-            <h1>f</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/index.html
deleted file mode 100644
index 59652a6d..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/index.html	
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>[jvm root]</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
-          <div class="cover ">
-            <h1>Package [jvm root]</h1>
-          </div>
-          <h2>Types</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="-fancy/index.html">Fancy</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">annotation class <a href="-fancy/index.html">Fancy</a></div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="f.html">f</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/-init-.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/-init-.html
new file mode 100644
index 00000000..0ce13e70
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/-init-.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>&lt;init&gt;</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/Fancy/&lt;init&gt;/#kotlin.Int//">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[main root]</a>/<a href="index.html">Fancy</a>/<a href="-init-.html">&lt;init&gt;</a></div>
+          <div class="cover ">
+            <h1>&lt;init&gt;</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="-init-.html">&lt;init&gt;</a>(size: <a href="">Int</a>)</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/equals.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/equals.html
new file mode 100644
index 00000000..5de2c68d
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/equals.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>equals</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="/Fancy/equals/#kotlin.Any?//">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[main root]</a>/<a href="index.html">Fancy</a>/<a href="equals.html">equals</a></div>
+          <div class="cover ">
+            <h1>equals</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/hash-code.html
new file mode 100644
index 00000000..675c156f
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/hash-code.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>hashCode</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="/Fancy/hashCode/#//">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[main root]</a>/<a href="index.html">Fancy</a>/<a href="hash-code.html">hashCode</a></div>
+          <div class="cover ">
+            <h1>hashCode</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/index.html
new file mode 100644
index 00000000..984c084b
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/index.html	
@@ -0,0 +1,102 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>Fancy</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/Fancy////">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[main root]</a>/<a href="index.html">Fancy</a></div>
+          <div class="cover ">
+            <h1>Fancy</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">annotation class <a href="index.html">Fancy</a></div></div></div>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="equals.html">equals</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div></div>
+                </div>
+              </div>
+            </div>
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="hash-code.html">hashCode</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div></div>
+                </div>
+              </div>
+            </div>
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="to-string.html">toString</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <h2>Properties</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="">size</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final val <a href="">size</a>: <a href="">Int</a></div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/to-string.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/to-string.html
new file mode 100644
index 00000000..4e1a0346
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/-fancy/to-string.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>toString</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="/Fancy/toString/#//">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[main root]</a>/<a href="index.html">Fancy</a>/<a href="to-string.html">toString</a></div>
+          <div class="cover ">
+            <h1>toString</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/f.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/f.html
new file mode 100644
index 00000000..8044ccbf
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/f.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>f</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//f/#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a>/<a href="f.html">f</a></div>
+          <div class="cover ">
+            <h1>f</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/index.html
new file mode 100644
index 00000000..9b60126a
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[main root]/index.html	
@@ -0,0 +1,69 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>[main root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a></div>
+          <div class="cover ">
+            <h1>Package [main root]</h1>
+          </div>
+          <h2>Types</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="-fancy/index.html">Fancy</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">annotation class <a href="-fancy/index.html">Fancy</a></div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="f.html">f</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html
index 2c55944d..2b62b11c 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html
@@ -27,9 +27,9 @@
           <div class="table">
             <div class="table-row">
               <div class="main-subrow">
-                <div class="title"><a href="[jvm root]/index.html">[jvm root]</a></div>
+                <div class="title"><a href="[main root]/index.html">[main root]</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/package-list b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/package-list
index 8dcb9116..a5413b7c 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/package-list
@@ -1,8 +1,8 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://f/#//root/[jvm root]/f.html
-$dokka.location:/Fancy/equals/#kotlin.Any?//root/[jvm root]/-fancy/equals.html
-$dokka.location:/Fancy/hashCode/#//root/[jvm root]/-fancy/hash-code.html
-$dokka.location:/Fancy/toString/#//root/[jvm root]/-fancy/to-string.html
-[jvm root]
+$dokka.location://f/#//root/[main root]/f.html
+$dokka.location:/Fancy/equals/#kotlin.Any?//root/[main root]/-fancy/equals.html
+$dokka.location:/Fancy/hashCode/#//root/[main root]/-fancy/hash-code.html
+$dokka.location:/Fancy/toString/#//root/[main root]/-fancy/to-string.html
+[main root]
 
diff --git a/plugins/base/src/test/resources/expect/function/out/html/navigation.html b/plugins/base/src/test/resources/expect/function/out/html/navigation.html
index 3e532bec..f9058a8f 100644
--- a/plugins/base/src/test/resources/expect/function/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/function/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
-    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[main root]/////">
+    <div class="overview"><a href="root/[main root]/index.html">[main root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//fn/#//">
-      <div class="overview"><a href="root/[jvm root]/fn.html">fn</a></div>
+      <div class="overview"><a href="root/[main root]/fn.html">fn</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/fn.html b/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/fn.html
deleted file mode 100644
index abb882ae..00000000
--- a/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/fn.html	
+++ /dev/null
@@ -1,34 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>fn</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//fn/#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="fn.html">fn</a></div>
-          <div class="cover ">
-            <h1>fn</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div></div></div>
-          </div>
-          <h3>Description</h3>
-          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">Function fn</div></div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/index.html
deleted file mode 100644
index c7b72589..00000000
--- a/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/index.html	
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>[jvm root]</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
-          <div class="cover ">
-            <h1>Package [jvm root]</h1>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="fn.html">fn</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/[main root]/fn.html b/plugins/base/src/test/resources/expect/function/out/html/root/[main root]/fn.html
new file mode 100644
index 00000000..775304da
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/function/out/html/root/[main root]/fn.html	
@@ -0,0 +1,34 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>fn</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//fn/#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a>/<a href="fn.html">fn</a></div>
+          <div class="cover ">
+            <h1>fn</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div></div></div>
+          </div>
+          <h3>Description</h3>
+          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main">Function fn</div></div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/[main root]/index.html b/plugins/base/src/test/resources/expect/function/out/html/root/[main root]/index.html
new file mode 100644
index 00000000..bc7f8f86
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/function/out/html/root/[main root]/index.html	
@@ -0,0 +1,50 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>[main root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a></div>
+          <div class="cover ">
+            <h1>Package [main root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="fn.html">fn</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/index.html b/plugins/base/src/test/resources/expect/function/out/html/root/index.html
index 2c55944d..2b62b11c 100644
--- a/plugins/base/src/test/resources/expect/function/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/function/out/html/root/index.html
@@ -27,9 +27,9 @@
           <div class="table">
             <div class="table-row">
               <div class="main-subrow">
-                <div class="title"><a href="[jvm root]/index.html">[jvm root]</a></div>
+                <div class="title"><a href="[main root]/index.html">[main root]</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/package-list b/plugins/base/src/test/resources/expect/function/out/html/root/package-list
index 9430f445..d0e46007 100644
--- a/plugins/base/src/test/resources/expect/function/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/function/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://fn/#//root/[jvm root]/fn.html
-[jvm root]
+$dokka.location://fn/#//root/[main root]/fn.html
+[main root]
 
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/navigation.html
index df89ba77..dd3ea05b 100644
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/navigation.html
@@ -1,12 +1,12 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
-    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-    <div class="sideMenuPart" id="nav-submenu-0-0" pageId="[jvm root]/Fancy////">
-      <div class="overview"><a href="root/[jvm root]/-fancy/index.html">Fancy</a></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[main root]/////">
+    <div class="overview"><a href="root/[main root]/index.html">[main root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+    <div class="sideMenuPart" id="nav-submenu-0-0" pageId="[main root]/Fancy////">
+      <div class="overview"><a href="root/[main root]/-fancy/index.html">Fancy</a></div>
     </div>
     <div class="sideMenuPart" id="nav-submenu-0-1" pageId="//function/#kotlin.Function0[kotlin.Unit]//">
-      <div class="overview"><a href="root/[jvm root]/function.html">function</a></div>
+      <div class="overview"><a href="root/[main root]/function.html">function</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/-init-.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/-init-.html
deleted file mode 100644
index 5aa8aba5..00000000
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/-init-.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>&lt;init&gt;</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/Fancy/&lt;init&gt;/#//">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="-init-.html">&lt;init&gt;</a></div>
-          <div class="cover ">
-            <h1>&lt;init&gt;</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="-init-.html">&lt;init&gt;</a>()</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/equals.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/equals.html
deleted file mode 100644
index 52566473..00000000
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/equals.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>equals</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="/Fancy/equals/#kotlin.Any?//">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="equals.html">equals</a></div>
-          <div class="cover ">
-            <h1>equals</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/hash-code.html
deleted file mode 100644
index 98338519..00000000
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/hash-code.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>hashCode</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="/Fancy/hashCode/#//">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="hash-code.html">hashCode</a></div>
-          <div class="cover ">
-            <h1>hashCode</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html
deleted file mode 100644
index 14804ca4..00000000
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html	
+++ /dev/null
@@ -1,83 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>Fancy</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/Fancy////">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a></div>
-          <div class="cover ">
-            <h1>Fancy</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">annotation class <a href="index.html">Fancy</a></div></div></div>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="equals.html">equals</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div></div>
-                </div>
-              </div>
-            </div>
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="hash-code.html">hashCode</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div></div>
-                </div>
-              </div>
-            </div>
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="to-string.html">toString</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/to-string.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/to-string.html
deleted file mode 100644
index b64fcf93..00000000
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/to-string.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>toString</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="/Fancy/toString/#//">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="to-string.html">toString</a></div>
-          <div class="cover ">
-            <h1>toString</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/function.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/function.html
deleted file mode 100644
index d4436f44..00000000
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/function.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>function</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//function/#kotlin.Function0[kotlin.Unit]//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="function.html">function</a></div>
-          <div class="cover ">
-            <h1>function</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html
deleted file mode 100644
index e51fe2b2..00000000
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html	
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>[jvm root]</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
-          <div class="cover ">
-            <h1>Package [jvm root]</h1>
-          </div>
-          <h2>Types</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="-fancy/index.html">Fancy</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">annotation class <a href="-fancy/index.html">Fancy</a></div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="function.html">function</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/-init-.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/-init-.html
new file mode 100644
index 00000000..80bf13d6
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/-init-.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>&lt;init&gt;</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/Fancy/&lt;init&gt;/#//">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[main root]</a>/<a href="index.html">Fancy</a>/<a href="-init-.html">&lt;init&gt;</a></div>
+          <div class="cover ">
+            <h1>&lt;init&gt;</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="-init-.html">&lt;init&gt;</a>()</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/equals.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/equals.html
new file mode 100644
index 00000000..5de2c68d
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/equals.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>equals</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="/Fancy/equals/#kotlin.Any?//">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[main root]</a>/<a href="index.html">Fancy</a>/<a href="equals.html">equals</a></div>
+          <div class="cover ">
+            <h1>equals</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/hash-code.html
new file mode 100644
index 00000000..675c156f
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/hash-code.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>hashCode</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="/Fancy/hashCode/#//">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[main root]</a>/<a href="index.html">Fancy</a>/<a href="hash-code.html">hashCode</a></div>
+          <div class="cover ">
+            <h1>hashCode</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/index.html
new file mode 100644
index 00000000..7445b029
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/index.html	
@@ -0,0 +1,83 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>Fancy</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/Fancy////">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[main root]</a>/<a href="index.html">Fancy</a></div>
+          <div class="cover ">
+            <h1>Fancy</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">annotation class <a href="index.html">Fancy</a></div></div></div>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="equals.html">equals</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div></div>
+                </div>
+              </div>
+            </div>
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="hash-code.html">hashCode</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div></div>
+                </div>
+              </div>
+            </div>
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="to-string.html">toString</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/to-string.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/to-string.html
new file mode 100644
index 00000000..4e1a0346
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/-fancy/to-string.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>toString</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="/Fancy/toString/#//">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[main root]</a>/<a href="index.html">Fancy</a>/<a href="to-string.html">toString</a></div>
+          <div class="cover ">
+            <h1>toString</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/function.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/function.html
new file mode 100644
index 00000000..d7f9f550
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/function.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>function</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//function/#kotlin.Function0[kotlin.Unit]//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a>/<a href="function.html">function</a></div>
+          <div class="cover ">
+            <h1>function</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/index.html
new file mode 100644
index 00000000..b4ad01f5
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[main root]/index.html	
@@ -0,0 +1,69 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>[main root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a></div>
+          <div class="cover ">
+            <h1>Package [main root]</h1>
+          </div>
+          <h2>Types</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="-fancy/index.html">Fancy</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">annotation class <a href="-fancy/index.html">Fancy</a></div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="function.html">function</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html
index 2c55944d..2b62b11c 100644
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html
@@ -27,9 +27,9 @@
           <div class="table">
             <div class="table-row">
               <div class="main-subrow">
-                <div class="title"><a href="[jvm root]/index.html">[jvm root]</a></div>
+                <div class="title"><a href="[main root]/index.html">[main root]</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/package-list
index 141e96fd..fb79fbe8 100644
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/package-list
@@ -1,8 +1,8 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://function/#kotlin.Function0[kotlin.Unit]//root/[jvm root]/function.html
-$dokka.location:/Fancy/equals/#kotlin.Any?//root/[jvm root]/-fancy/equals.html
-$dokka.location:/Fancy/hashCode/#//root/[jvm root]/-fancy/hash-code.html
-$dokka.location:/Fancy/toString/#//root/[jvm root]/-fancy/to-string.html
-[jvm root]
+$dokka.location://function/#kotlin.Function0[kotlin.Unit]//root/[main root]/function.html
+$dokka.location:/Fancy/equals/#kotlin.Any?//root/[main root]/-fancy/equals.html
+$dokka.location:/Fancy/hashCode/#//root/[main root]/-fancy/hash-code.html
+$dokka.location:/Fancy/toString/#//root/[main root]/-fancy/to-string.html
+[main root]
 
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/navigation.html
index 6d159123..7edbae7d 100644
--- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
-    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[main root]/////">
+    <div class="overview"><a href="root/[main root]/index.html">[main root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#kotlin.String//">
-      <div class="overview"><a href="root/[jvm root]/f.html">f</a></div>
+      <div class="overview"><a href="root/[main root]/f.html">f</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/f.html
deleted file mode 100644
index c395f3b6..00000000
--- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/f.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>f</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//f/#kotlin.String//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div>
-          <div class="cover ">
-            <h1>f</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(x: <a href="">String</a>)</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/index.html
deleted file mode 100644
index 9e048fbe..00000000
--- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/index.html	
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>[jvm root]</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
-          <div class="cover ">
-            <h1>Package [jvm root]</h1>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="f.html">f</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="f.html">f</a>(x: <a href="">String</a>)</div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[main root]/f.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[main root]/f.html
new file mode 100644
index 00000000..dedf121b
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[main root]/f.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>f</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//f/#kotlin.String//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a>/<a href="f.html">f</a></div>
+          <div class="cover ">
+            <h1>f</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="f.html">f</a>(x: <a href="">String</a>)</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[main root]/index.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[main root]/index.html
new file mode 100644
index 00000000..47b5a8ae
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[main root]/index.html	
@@ -0,0 +1,50 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>[main root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a></div>
+          <div class="cover ">
+            <h1>Package [main root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="f.html">f</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="f.html">f</a>(x: <a href="">String</a>)</div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html
index 2c55944d..2b62b11c 100644
--- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html
@@ -27,9 +27,9 @@
           <div class="table">
             <div class="table-row">
               <div class="main-subrow">
-                <div class="title"><a href="[jvm root]/index.html">[jvm root]</a></div>
+                <div class="title"><a href="[main root]/index.html">[main root]</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/package-list
index 2887ed99..e733b252 100644
--- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://f/#kotlin.String//root/[jvm root]/f.html
-[jvm root]
+$dokka.location://f/#kotlin.String//root/[main root]/f.html
+[main root]
 
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/navigation.html
index b3a068a3..e75d2599 100644
--- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
-    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[main root]/////">
+    <div class="overview"><a href="root/[main root]/index.html">[main root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//function/#kotlin.Function0[kotlin.Unit]//">
-      <div class="overview"><a href="root/[jvm root]/function.html">function</a></div>
+      <div class="overview"><a href="root/[main root]/function.html">function</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/function.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/function.html
deleted file mode 100644
index d4436f44..00000000
--- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/function.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>function</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//function/#kotlin.Function0[kotlin.Unit]//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="function.html">function</a></div>
-          <div class="cover ">
-            <h1>function</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/index.html
deleted file mode 100644
index 4825e352..00000000
--- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/index.html	
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>[jvm root]</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
-          <div class="cover ">
-            <h1>Package [jvm root]</h1>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="function.html">function</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[main root]/function.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[main root]/function.html
new file mode 100644
index 00000000..d7f9f550
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[main root]/function.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>function</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//function/#kotlin.Function0[kotlin.Unit]//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a>/<a href="function.html">function</a></div>
+          <div class="cover ">
+            <h1>function</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[main root]/index.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[main root]/index.html
new file mode 100644
index 00000000..8201541c
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[main root]/index.html	
@@ -0,0 +1,50 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>[main root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a></div>
+          <div class="cover ">
+            <h1>Package [main root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="function.html">function</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html
index 2c55944d..2b62b11c 100644
--- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html
@@ -27,9 +27,9 @@
           <div class="table">
             <div class="table-row">
               <div class="main-subrow">
-                <div class="title"><a href="[jvm root]/index.html">[jvm root]</a></div>
+                <div class="title"><a href="[main root]/index.html">[main root]</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/package-list
index 4200e2d8..73470d00 100644
--- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://function/#kotlin.Function0[kotlin.Unit]//root/[jvm root]/function.html
-[jvm root]
+$dokka.location://function/#kotlin.Function0[kotlin.Unit]//root/[main root]/function.html
+[main root]
 
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/navigation.html
index 35fe78dc..29daddec 100644
--- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
-    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[main root]/////">
+    <div class="overview"><a href="root/[main root]/index.html">[main root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#//">
-      <div class="overview"><a href="root/[jvm root]/f.html">f</a></div>
+      <div class="overview"><a href="root/[main root]/f.html">f</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/f.html
deleted file mode 100644
index 6ca7daa7..00000000
--- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/f.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>f</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//f/#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div>
-          <div class="cover ">
-            <h1>f</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/index.html
deleted file mode 100644
index d1b41977..00000000
--- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/index.html	
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>[jvm root]</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
-          <div class="cover ">
-            <h1>Package [jvm root]</h1>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="f.html">f</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[main root]/f.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[main root]/f.html
new file mode 100644
index 00000000..8044ccbf
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[main root]/f.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>f</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//f/#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a>/<a href="f.html">f</a></div>
+          <div class="cover ">
+            <h1>f</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[main root]/index.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[main root]/index.html
new file mode 100644
index 00000000..9668ba81
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[main root]/index.html	
@@ -0,0 +1,50 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>[main root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a></div>
+          <div class="cover ">
+            <h1>Package [main root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="f.html">f</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html
index 2c55944d..2b62b11c 100644
--- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html
@@ -27,9 +27,9 @@
           <div class="table">
             <div class="table-row">
               <div class="main-subrow">
-                <div class="title"><a href="[jvm root]/index.html">[jvm root]</a></div>
+                <div class="title"><a href="[main root]/index.html">[main root]</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/package-list
index 8f1c5fd9..aed2a34c 100644
--- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://f/#//root/[jvm root]/f.html
-[jvm root]
+$dokka.location://f/#//root/[main root]/f.html
+[main root]
 
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/navigation.html
index 9e098fd0..2b6b4beb 100644
--- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
-    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[main root]/////">
+    <div class="overview"><a href="root/[main root]/index.html">[main root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//function/#kotlin.Int//">
-      <div class="overview"><a href="root/[jvm root]/function.html">function</a></div>
+      <div class="overview"><a href="root/[main root]/function.html">function</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/function.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/function.html
deleted file mode 100644
index 0fb966a6..00000000
--- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/function.html	
+++ /dev/null
@@ -1,34 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>function</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//function/#kotlin.Int//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="function.html">function</a></div>
-          <div class="cover ">
-            <h1>function</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(x: <a href="">Int</a>)</div></div></div>
-          </div>
-          <h3>Description</h3>
-          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">MultilineFunction Documentation</div></div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/index.html
deleted file mode 100644
index 31271e45..00000000
--- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/index.html	
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>[jvm root]</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
-          <div class="cover ">
-            <h1>Package [jvm root]</h1>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="function.html">function</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="function.html">function</a>(x: <a href="">Int</a>)</div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[main root]/function.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[main root]/function.html
new file mode 100644
index 00000000..98af2216
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[main root]/function.html	
@@ -0,0 +1,34 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>function</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//function/#kotlin.Int//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a>/<a href="function.html">function</a></div>
+          <div class="cover ">
+            <h1>function</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="function.html">function</a>(x: <a href="">Int</a>)</div></div></div>
+          </div>
+          <h3>Description</h3>
+          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main">MultilineFunction Documentation</div></div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[main root]/index.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[main root]/index.html
new file mode 100644
index 00000000..e2a0259d
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[main root]/index.html	
@@ -0,0 +1,50 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>[main root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a></div>
+          <div class="cover ">
+            <h1>Package [main root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="function.html">function</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="function.html">function</a>(x: <a href="">Int</a>)</div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html
index 2c55944d..2b62b11c 100644
--- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html
@@ -27,9 +27,9 @@
           <div class="table">
             <div class="table-row">
               <div class="main-subrow">
-                <div class="title"><a href="[jvm root]/index.html">[jvm root]</a></div>
+                <div class="title"><a href="[main root]/index.html">[main root]</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/package-list
index 6394d253..445b2e70 100644
--- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://function/#kotlin.Int//root/[jvm root]/function.html
-[jvm root]
+$dokka.location://function/#kotlin.Int//root/[main root]/function.html
+[main root]
 
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/navigation.html
index d5d3a9f4..daefbd81 100644
--- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
-    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[main root]/////">
+    <div class="overview"><a href="root/[main root]/index.html">[main root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//fn/kotlin.String#//">
-      <div class="overview"><a href="root/[jvm root]/fn.html">fn</a></div>
+      <div class="overview"><a href="root/[main root]/fn.html">fn</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/fn.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/fn.html
deleted file mode 100644
index a922d72f..00000000
--- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/fn.html	
+++ /dev/null
@@ -1,40 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>fn</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//fn/kotlin.String#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="fn.html">fn</a></div>
-          <div class="cover ">
-            <h1>fn</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>()</div></div></div>
-          </div>
-          <h3>Description</h3>
-          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">Function with receiver</div></div>
-          <div class="cover ">
-            <h1>fn</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>(x: <a href="">Int</a>)</div></div></div>
-          </div>
-          <h3>Description</h3>
-          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">Function with receiver</div></div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/index.html
deleted file mode 100644
index a646eb63..00000000
--- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/index.html	
+++ /dev/null
@@ -1,66 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>[jvm root]</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
-          <div class="cover ">
-            <h1>Package [jvm root]</h1>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="fn.html">fn</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>()</div></div></div></div>
-                </div>
-              </div>
-            </div>
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="fn.html">fn</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>(x: <a href="">Int</a>)</div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[main root]/fn.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[main root]/fn.html
new file mode 100644
index 00000000..03feac23
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[main root]/fn.html	
@@ -0,0 +1,40 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>fn</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//fn/kotlin.String#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a>/<a href="fn.html">fn</a></div>
+          <div class="cover ">
+            <h1>fn</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>()</div></div></div>
+          </div>
+          <h3>Description</h3>
+          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main">Function with receiver</div></div>
+          <div class="cover ">
+            <h1>fn</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>(x: <a href="">Int</a>)</div></div></div>
+          </div>
+          <h3>Description</h3>
+          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main">Function with receiver</div></div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[main root]/index.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[main root]/index.html
new file mode 100644
index 00000000..164f42e9
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[main root]/index.html	
@@ -0,0 +1,66 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>[main root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a></div>
+          <div class="cover ">
+            <h1>Package [main root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="fn.html">fn</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>()</div></div></div></div>
+                </div>
+              </div>
+            </div>
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="fn.html">fn</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>(x: <a href="">Int</a>)</div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html
index 2c55944d..2b62b11c 100644
--- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html
@@ -27,9 +27,9 @@
           <div class="table">
             <div class="table-row">
               <div class="main-subrow">
-                <div class="title"><a href="[jvm root]/index.html">[jvm root]</a></div>
+                <div class="title"><a href="[main root]/index.html">[main root]</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/package-list
index faeb244b..42c919d9 100644
--- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/package-list
@@ -1,6 +1,6 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://fn/kotlin.String#//root/[jvm root]/fn.html
-$dokka.location://fn/kotlin.String#kotlin.Int//root/[jvm root]/fn.html
-[jvm root]
+$dokka.location://fn/kotlin.String#//root/[main root]/fn.html
+$dokka.location://fn/kotlin.String#kotlin.Int//root/[main root]/fn.html
+[main root]
 
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/navigation.html
index 006a9e3e..cddadabd 100644
--- a/plugins/base/src/test/resources/expect/genericFunction/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
-    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[main root]/////">
+    <div class="overview"><a href="root/[main root]/index.html">[main root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//generic/#//">
-      <div class="overview"><a href="root/[jvm root]/generic.html">generic</a></div>
+      <div class="overview"><a href="root/[main root]/generic.html">generic</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/generic.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/generic.html
deleted file mode 100644
index 91519d2b..00000000
--- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/generic.html	
+++ /dev/null
@@ -1,34 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>generic</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//generic/#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="generic.html">generic</a></div>
-          <div class="cover ">
-            <h1>generic</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">private final fun &lt;<a href="generic.html">T</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div></div></div>
-          </div>
-          <h3>Description</h3>
-          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">generic function</div></div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/index.html
deleted file mode 100644
index 89261f63..00000000
--- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/index.html	
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>[jvm root]</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
-          <div class="cover ">
-            <h1>Package [jvm root]</h1>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="generic.html">generic</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">private final fun &lt;<a href="generic.html">T</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[main root]/generic.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[main root]/generic.html
new file mode 100644
index 00000000..de568b54
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[main root]/generic.html	
@@ -0,0 +1,34 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>generic</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//generic/#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a>/<a href="generic.html">generic</a></div>
+          <div class="cover ">
+            <h1>generic</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">private final fun &lt;<a href="generic.html">T</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div></div></div>
+          </div>
+          <h3>Description</h3>
+          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main">generic function</div></div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[main root]/index.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[main root]/index.html
new file mode 100644
index 00000000..65c8f4b6
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[main root]/index.html	
@@ -0,0 +1,50 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>[main root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a></div>
+          <div class="cover ">
+            <h1>Package [main root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="generic.html">generic</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">private final fun &lt;<a href="generic.html">T</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html
index 2c55944d..2b62b11c 100644
--- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html
@@ -27,9 +27,9 @@
           <div class="table">
             <div class="table-row">
               <div class="main-subrow">
-                <div class="title"><a href="[jvm root]/index.html">[jvm root]</a></div>
+                <div class="title"><a href="[main root]/index.html">[main root]</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/package-list
index 468c6cb4..328a6811 100644
--- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://generic/#//root/[jvm root]/generic.html
-[jvm root]
+$dokka.location://generic/#//root/[main root]/generic.html
+[main root]
 
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html
index 006a9e3e..cddadabd 100644
--- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
-    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[main root]/////">
+    <div class="overview"><a href="root/[main root]/index.html">[main root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//generic/#//">
-      <div class="overview"><a href="root/[jvm root]/generic.html">generic</a></div>
+      <div class="overview"><a href="root/[main root]/generic.html">generic</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html
deleted file mode 100644
index 3e44781b..00000000
--- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html	
+++ /dev/null
@@ -1,34 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>generic</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//generic/#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="generic.html">generic</a></div>
-          <div class="cover ">
-            <h1>generic</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun &lt;<a href="generic.html">T</a> : R, <a href="generic.html">R</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div></div></div>
-          </div>
-          <h3>Description</h3>
-          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">generic function</div></div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html
deleted file mode 100644
index 4d02021a..00000000
--- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html	
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>[jvm root]</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
-          <div class="cover ">
-            <h1>Package [jvm root]</h1>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="generic.html">generic</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun &lt;<a href="generic.html">T</a> : R, <a href="generic.html">R</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[main root]/generic.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[main root]/generic.html
new file mode 100644
index 00000000..af73a7ae
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[main root]/generic.html	
@@ -0,0 +1,34 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>generic</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//generic/#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a>/<a href="generic.html">generic</a></div>
+          <div class="cover ">
+            <h1>generic</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun &lt;<a href="generic.html">T</a> : R, <a href="generic.html">R</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div></div></div>
+          </div>
+          <h3>Description</h3>
+          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main">generic function</div></div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[main root]/index.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[main root]/index.html
new file mode 100644
index 00000000..6d091562
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[main root]/index.html	
@@ -0,0 +1,50 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>[main root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a></div>
+          <div class="cover ">
+            <h1>Package [main root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="generic.html">generic</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun &lt;<a href="generic.html">T</a> : R, <a href="generic.html">R</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html
index 2c55944d..2b62b11c 100644
--- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html
@@ -27,9 +27,9 @@
           <div class="table">
             <div class="table-row">
               <div class="main-subrow">
-                <div class="title"><a href="[jvm root]/index.html">[jvm root]</a></div>
+                <div class="title"><a href="[main root]/index.html">[main root]</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list
index 468c6cb4..328a6811 100644
--- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://generic/#//root/[jvm root]/generic.html
-[jvm root]
+$dokka.location://generic/#//root/[main root]/generic.html
+[main root]
 
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/navigation.html
index f949d074..b3656a55 100644
--- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
-    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[main root]/////">
+    <div class="overview"><a href="root/[main root]/index.html">[main root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#kotlin.Function0[kotlin.String]//">
-      <div class="overview"><a href="root/[jvm root]/f.html">f</a></div>
+      <div class="overview"><a href="root/[main root]/f.html">f</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/f.html
deleted file mode 100644
index 3766ad15..00000000
--- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/f.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>f</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div>
-          <div class="cover ">
-            <h1>f</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/index.html
deleted file mode 100644
index 26d40926..00000000
--- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/index.html	
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>[jvm root]</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
-          <div class="cover ">
-            <h1>Package [jvm root]</h1>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="f.html">f</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[main root]/f.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[main root]/f.html
new file mode 100644
index 00000000..f6fdb40a
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[main root]/f.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>f</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a>/<a href="f.html">f</a></div>
+          <div class="cover ">
+            <h1>f</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[main root]/index.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[main root]/index.html
new file mode 100644
index 00000000..79216743
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[main root]/index.html	
@@ -0,0 +1,50 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>[main root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a></div>
+          <div class="cover ">
+            <h1>Package [main root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="f.html">f</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html
index 2c55944d..2b62b11c 100644
--- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html
@@ -27,9 +27,9 @@
           <div class="table">
             <div class="table-row">
               <div class="main-subrow">
-                <div class="title"><a href="[jvm root]/index.html">[jvm root]</a></div>
+                <div class="title"><a href="[main root]/index.html">[main root]</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/package-list
index ce137c16..26e2f605 100644
--- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://f/#kotlin.Function0[kotlin.String]//root/[jvm root]/f.html
-[jvm root]
+$dokka.location://f/#kotlin.Function0[kotlin.String]//root/[main root]/f.html
+[main root]
 
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/navigation.html
index f949d074..b3656a55 100644
--- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
-    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[main root]/////">
+    <div class="overview"><a href="root/[main root]/index.html">[main root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#kotlin.Function0[kotlin.String]//">
-      <div class="overview"><a href="root/[jvm root]/f.html">f</a></div>
+      <div class="overview"><a href="root/[main root]/f.html">f</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/f.html
deleted file mode 100644
index 3766ad15..00000000
--- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/f.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>f</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div>
-          <div class="cover ">
-            <h1>f</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/index.html
deleted file mode 100644
index 26d40926..00000000
--- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/index.html	
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>[jvm root]</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
-          <div class="cover ">
-            <h1>Package [jvm root]</h1>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="f.html">f</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[main root]/f.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[main root]/f.html
new file mode 100644
index 00000000..f6fdb40a
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[main root]/f.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>f</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a>/<a href="f.html">f</a></div>
+          <div class="cover ">
+            <h1>f</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[main root]/index.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[main root]/index.html
new file mode 100644
index 00000000..79216743
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[main root]/index.html	
@@ -0,0 +1,50 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>[main root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a></div>
+          <div class="cover ">
+            <h1>Package [main root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="f.html">f</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html
index 2c55944d..2b62b11c 100644
--- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html
@@ -27,9 +27,9 @@
           <div class="table">
             <div class="table-row">
               <div class="main-subrow">
-                <div class="title"><a href="[jvm root]/index.html">[jvm root]</a></div>
+                <div class="title"><a href="[main root]/index.html">[main root]</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/package-list
index ce137c16..26e2f605 100644
--- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://f/#kotlin.Function0[kotlin.String]//root/[jvm root]/f.html
-[jvm root]
+$dokka.location://f/#kotlin.Function0[kotlin.String]//root/[main root]/f.html
+[main root]
 
diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/index.html b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/index.html
index fd166ca9..03fe3b32 100644
--- a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/index.html
@@ -29,7 +29,7 @@
               <div class="main-subrow">
                 <div class="title"><a href="signatureTest/index.html">signatureTest</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/index.html b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/index.html
index 8d27b36e..4147b88e 100644
--- a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/index.html
+++ b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/index.html
@@ -32,12 +32,12 @@
                   <div class="brief "> </div>
                 </div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
               <div class="signature-subrow">
                 <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="test.html">test</a>(i: <div class="symbol monospace">(<a href="">Int</a>) -&gt; <a href="">Int</a></div>)</div></div></div></div>
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="test.html">test</a>(i: <div class="symbol monospace">(<a href="">Int</a>) -&gt; <a href="">Int</a></div>)</div></div></div></div>
                 </div>
               </div>
             </div>
@@ -48,12 +48,12 @@
                   <div class="brief "> </div>
                 </div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
               <div class="signature-subrow">
                 <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="test2.html">test2</a>(i: <div class="symbol monospace"><a href="">Int</a>.(<a href="">Int</a>) -&gt; <a href="">Int</a></div>)</div></div></div></div>
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="test2.html">test2</a>(i: <div class="symbol monospace"><a href="">Int</a>.(<a href="">Int</a>) -&gt; <a href="">Int</a></div>)</div></div></div></div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test.html b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test.html
index 0252ebc5..333ee75a 100644
--- a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test.html
+++ b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test.html
@@ -22,7 +22,7 @@
           <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">signatureTest</a>/<a href="test.html">test</a></div>
           <div class="cover ">
             <h1>test</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="test.html">test</a>(i: <div class="symbol monospace">(<a href="">Int</a>) -&gt; <a href="">Int</a></div>)</div></div></div>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="test.html">test</a>(i: <div class="symbol monospace">(<a href="">Int</a>) -&gt; <a href="">Int</a></div>)</div></div></div>
           </div>
         </div>
       </div>
diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test2.html b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test2.html
index ab388675..ebc34123 100644
--- a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test2.html
+++ b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test2.html
@@ -22,7 +22,7 @@
           <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">signatureTest</a>/<a href="test2.html">test2</a></div>
           <div class="cover ">
             <h1>test2</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="test2.html">test2</a>(i: <div class="symbol monospace"><a href="">Int</a>.(<a href="">Int</a>) -&gt; <a href="">Int</a></div>)</div></div></div>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="test2.html">test2</a>(i: <div class="symbol monospace"><a href="">Int</a>.(<a href="">Int</a>) -&gt; <a href="">Int</a></div>)</div></div></div>
           </div>
         </div>
       </div>
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/navigation.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/navigation.html
index ff1a753c..8e375351 100644
--- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
-    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[main root]/////">
+    <div class="overview"><a href="root/[main root]/index.html">[main root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//availableSince1.1/#//">
-      <div class="overview"><a href="root/[jvm root]/available-since1.1.html">availableSince1.1</a></div>
+      <div class="overview"><a href="root/[main root]/available-since1.1.html">availableSince1.1</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/available-since1.1.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/available-since1.1.html
deleted file mode 100644
index cdf2898c..00000000
--- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/available-since1.1.html	
+++ /dev/null
@@ -1,34 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>availableSince1.1</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//availableSince1.1/#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="available-since1.1.html">availableSince1.1</a></div>
-          <div class="cover ">
-            <h1>availableSince1.1</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="available-since1.1.html">availableSince1.1</a>(): <a href="">String</a></div></div></div>
-          </div>
-          <h3>Description</h3>
-          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">Quite useful <a href="">String</a></div></div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/index.html
deleted file mode 100644
index ee56ace9..00000000
--- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/index.html	
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>[jvm root]</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
-          <div class="cover ">
-            <h1>Package [jvm root]</h1>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="available-since1.1.html">availableSince1.1</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="available-since1.1.html">availableSince1.1</a>(): <a href="">String</a></div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[main root]/available-since1.1.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[main root]/available-since1.1.html
new file mode 100644
index 00000000..d02eb734
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[main root]/available-since1.1.html	
@@ -0,0 +1,34 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>availableSince1.1</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//availableSince1.1/#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a>/<a href="available-since1.1.html">availableSince1.1</a></div>
+          <div class="cover ">
+            <h1>availableSince1.1</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="available-since1.1.html">availableSince1.1</a>(): <a href="">String</a></div></div></div>
+          </div>
+          <h3>Description</h3>
+          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main">Quite useful <a href="">String</a></div></div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[main root]/index.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[main root]/index.html
new file mode 100644
index 00000000..cde151a7
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[main root]/index.html	
@@ -0,0 +1,50 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>[main root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a></div>
+          <div class="cover ">
+            <h1>Package [main root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="available-since1.1.html">availableSince1.1</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="available-since1.1.html">availableSince1.1</a>(): <a href="">String</a></div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html
index 2c55944d..2b62b11c 100644
--- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html
@@ -27,9 +27,9 @@
           <div class="table">
             <div class="table-row">
               <div class="main-subrow">
-                <div class="title"><a href="[jvm root]/index.html">[jvm root]</a></div>
+                <div class="title"><a href="[main root]/index.html">[main root]</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/package-list b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/package-list
index adc667ec..c90f53ec 100644
--- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://availableSince1.1/#//root/[jvm root]/available-since1.1.html
-[jvm root]
+$dokka.location://availableSince1.1/#//root/[main root]/available-since1.1.html
+[main root]
 
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/navigation.html
index 35fe78dc..29daddec 100644
--- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
-    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[main root]/////">
+    <div class="overview"><a href="root/[main root]/index.html">[main root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#//">
-      <div class="overview"><a href="root/[jvm root]/f.html">f</a></div>
+      <div class="overview"><a href="root/[main root]/f.html">f</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/f.html
deleted file mode 100644
index 6ca7daa7..00000000
--- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/f.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>f</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//f/#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div>
-          <div class="cover ">
-            <h1>f</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/index.html
deleted file mode 100644
index d1b41977..00000000
--- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/index.html	
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>[jvm root]</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
-          <div class="cover ">
-            <h1>Package [jvm root]</h1>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="f.html">f</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[main root]/f.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[main root]/f.html
new file mode 100644
index 00000000..8044ccbf
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[main root]/f.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>f</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//f/#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a>/<a href="f.html">f</a></div>
+          <div class="cover ">
+            <h1>f</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[main root]/index.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[main root]/index.html
new file mode 100644
index 00000000..9668ba81
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[main root]/index.html	
@@ -0,0 +1,50 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>[main root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a></div>
+          <div class="cover ">
+            <h1>Package [main root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="f.html">f</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html
index 2c55944d..2b62b11c 100644
--- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html
@@ -27,9 +27,9 @@
           <div class="table">
             <div class="table-row">
               <div class="main-subrow">
-                <div class="title"><a href="[jvm root]/index.html">[jvm root]</a></div>
+                <div class="title"><a href="[main root]/index.html">[main root]</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/package-list
index 8f1c5fd9..aed2a34c 100644
--- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://f/#//root/[jvm root]/f.html
-[jvm root]
+$dokka.location://f/#//root/[main root]/f.html
+[main root]
 
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/navigation.html
index f949d074..b3656a55 100644
--- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
-    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[main root]/////">
+    <div class="overview"><a href="root/[main root]/index.html">[main root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#kotlin.Function0[kotlin.String]//">
-      <div class="overview"><a href="root/[jvm root]/f.html">f</a></div>
+      <div class="overview"><a href="root/[main root]/f.html">f</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/f.html
deleted file mode 100644
index 3766ad15..00000000
--- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/f.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>f</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div>
-          <div class="cover ">
-            <h1>f</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/index.html
deleted file mode 100644
index 26d40926..00000000
--- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/index.html	
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
-    <title>[jvm root]</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="[jvm root]/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
-          <div class="cover ">
-            <h1>Package [jvm root]</h1>
-          </div>
-          <h2>Functions</h2>
-          <div class="table">
-            <div class="table-row">
-              <div class="main-subrow">
-                <div class="title"><a href="f.html">f</a></div>
-                <div class="brief">
-                  <div class="brief "> </div>
-                </div>
-                <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
-                </div>
-              </div>
-              <div class="signature-subrow">
-                <div class="signatures">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol "><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div></div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[main root]/f.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[main root]/f.html
new file mode 100644
index 00000000..f6fdb40a
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[main root]/f.html	
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>f</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a>/<a href="f.html">f</a></div>
+          <div class="cover ">
+            <h1>f</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[main root]/index.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[main root]/index.html
new file mode 100644
index 00000000..79216743
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[main root]/index.html	
@@ -0,0 +1,50 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>[main root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <link href="../../styles/jetbrains-mono.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[main root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[main root]</a></div>
+          <div class="cover ">
+            <h1>Package [main root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <div class="table">
+            <div class="table-row">
+              <div class="main-subrow">
+                <div class="title"><a href="f.html">f</a></div>
+                <div class="brief">
+                  <div class="brief "> </div>
+                </div>
+                <div class="platform-tags">
+                  <div class="platform-tag">main</div>
+                </div>
+              </div>
+              <div class="signature-subrow">
+                <div class="signatures">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="main"><div class="symbol "><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html
index 2c55944d..2b62b11c 100644
--- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html
@@ -27,9 +27,9 @@
           <div class="table">
             <div class="table-row">
               <div class="main-subrow">
-                <div class="title"><a href="[jvm root]/index.html">[jvm root]</a></div>
+                <div class="title"><a href="[main root]/index.html">[main root]</a></div>
                 <div class="platform-tags">
-                  <div class="platform-tag">jvm</div>
+                  <div class="platform-tag">main</div>
                 </div>
               </div>
             </div>
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/package-list
index ce137c16..26e2f605 100644
--- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://f/#kotlin.Function0[kotlin.String]//root/[jvm root]/f.html
-[jvm root]
+$dokka.location://f/#kotlin.Function0[kotlin.String]//root/[main root]/f.html
+[main root]
 
diff --git a/plugins/gfm/src/main/kotlin/GfmPlugin.kt b/plugins/gfm/src/main/kotlin/GfmPlugin.kt
index c65f3673..b7e9f6ab 100644
--- a/plugins/gfm/src/main/kotlin/GfmPlugin.kt
+++ b/plugins/gfm/src/main/kotlin/GfmPlugin.kt
@@ -7,6 +7,7 @@ import org.jetbrains.dokka.base.renderers.PackageListCreator
 import org.jetbrains.dokka.base.renderers.RootCreator
 import org.jetbrains.dokka.base.resolvers.local.DefaultLocationProvider
 import org.jetbrains.dokka.base.resolvers.local.LocationProviderFactory
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.DokkaPlugin
@@ -62,7 +63,7 @@ open class CommonmarkRenderer(
         append("]($address)")
     }
 
-    override fun StringBuilder.buildList(node: ContentList, pageContext: ContentPage, platformRestriction: PlatformData?) {
+    override fun StringBuilder.buildList(node: ContentList, pageContext: ContentPage, platformRestriction: SourceSetData?) {
         buildParagraph()
         buildListLevel(node, pageContext)
         buildParagraph()
@@ -107,15 +108,15 @@ open class CommonmarkRenderer(
     }
 
     override fun StringBuilder.buildPlatformDependent(content: PlatformHintedContent, pageContext: ContentPage) {
-        val distinct = content.platforms.map {
+        val distinct = content.sourceSets.map {
             it to StringBuilder().apply {buildContentNode(content.inner, pageContext, it) }.toString()
-        }.groupBy(Pair<PlatformData, String>::second, Pair<PlatformData, String>::first)
+        }.groupBy(Pair<SourceSetData, String>::second, Pair<SourceSetData, String>::first)
 
         if (distinct.size == 1)
             append(distinct.keys.single())
         else
             distinct.forEach { text, platforms ->
-                append(platforms.joinToString(prefix = " [", postfix = "] $text") { it.name })
+                append(platforms.joinToString(prefix = " [", postfix = "] $text") { "${it.moduleName}/${it.sourceSetName}"  })
             }
     }
 
@@ -123,7 +124,7 @@ open class CommonmarkRenderer(
         append("Resource")
     }
 
-    override fun StringBuilder.buildTable(node: ContentTable, pageContext: ContentPage, platformRestriction: PlatformData?) {
+    override fun StringBuilder.buildTable(node: ContentTable, pageContext: ContentPage, platformRestriction: SourceSetData?) {
 
         buildParagraph()
         val size = node.children.firstOrNull()?.children?.size ?: 0
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index 0befe077..5a77016d 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -17,7 +17,7 @@ private fun <T : WithExpectActual> List<T>.groupedByLocation() =
     map { it.sources to it }
         .groupBy({ (location, _) ->
             location.let {
-                it.map.entries.first().value.path.split("/").last().split(".").first() + "Kt"
+                it.entries.first().value.path.split("/").last().split(".").first() + "Kt"
             } // TODO: first() does not look reasonable
         }) { it.second }
 
@@ -37,18 +37,17 @@ internal fun DPackage.asJava(): DPackage {
                                 nodes.filterIsInstance<DFunction>()
                                     .map { it.asJava(syntheticClassName) }), // TODO: methods are static and receiver is a param
                 classlikes = emptyList(),
-                sources = PlatformDependent.empty(),
-                visibility = PlatformDependent(
-                    platformData.map {
-                        it to JavaVisibility.Public
-                    }.toMap()
-                ),
+                sources = emptyMap(),
+                expectPresentInSet = null,
+                visibility = sourceSets.map {
+                    it to JavaVisibility.Public
+                }.toMap(),
                 companion = null,
                 generics = emptyList(),
-                supertypes = PlatformDependent.empty(),
-                documentation = PlatformDependent.empty(),
-                modifier = PlatformDependent(map = platformData.map{ it to JavaModifier.Final}.toMap()),
-                platformData = platformData,
+                supertypes = emptyMap(),
+                documentation = emptyMap(),
+                modifier = sourceSets.map{ it to JavaModifier.Final}.toMap(),
+                sourceSets = sourceSets,
                 extra = PropertyContainer.empty()
             )
         }
@@ -68,13 +67,11 @@ internal fun DProperty.asJava(isTopLevel: Boolean = false, relocateToClass: Stri
             dri.withClass(relocateToClass)
         },
         modifier = if (setter == null) {
-            PlatformDependent(map = platformData.map{it to JavaModifier.Final}.toMap())
+            sourceSets.map{it to JavaModifier.Final}.toMap()
         } else {
-            PlatformDependent(map = platformData.map{it to JavaModifier.Empty}.toMap())
+            sourceSets.map{it to JavaModifier.Empty}.toMap()
         },
-        visibility = visibility.copy(
-            map = visibility.mapValues { JavaVisibility.Private }
-        ),
+        visibility = visibility.mapValues { JavaVisibility.Private },
         type = type.asJava(), // TODO: check
         setter = null,
         getter = null, // Removing getters and setters as they will be available as functions
@@ -91,13 +88,11 @@ internal fun DProperty.javaAccessors(isTopLevel: Boolean = false, relocateToClas
             },
             name = "get" + name.capitalize(),
             modifier = if (setter == null) {
-                PlatformDependent(map = platformData.map{it to JavaModifier.Final}.toMap())
+                sourceSets.map{it to JavaModifier.Final}.toMap()
             } else {
-                PlatformDependent(map = platformData.map{it to JavaModifier.Empty}.toMap())
+                sourceSets.map{it to JavaModifier.Empty}.toMap()
             },
-            visibility = visibility.copy(
-                map = visibility.mapValues { JavaVisibility.Public }
-            ),
+            visibility = visibility.mapValues { JavaVisibility.Public },
             type = type.asJava(), // TODO: check
             extra = if (isTopLevel) getter!!.extra.plus(getter!!.extra.mergeAdditionalModifiers(setOf(ExtraModifiers.STATIC))) else getter!!.extra
         ),
@@ -109,13 +104,11 @@ internal fun DProperty.javaAccessors(isTopLevel: Boolean = false, relocateToClas
             },
             name = "set" + name.capitalize(),
             modifier = if (setter == null) {
-                PlatformDependent(map = platformData.map{it to JavaModifier.Final}.toMap())
+                sourceSets.map{it to JavaModifier.Final}.toMap()
             } else {
-                PlatformDependent(map = platformData.map{it to JavaModifier.Empty}.toMap())
+                sourceSets.map{it to JavaModifier.Empty}.toMap()
             },
-            visibility = visibility.copy(
-                map = visibility.mapValues { JavaVisibility.Public }
-            ),
+            visibility = visibility.mapValues { JavaVisibility.Public },
             type = type.asJava(), // TODO: check
             extra = if (isTopLevel) setter!!.extra.plus(setter!!.extra.mergeAdditionalModifiers(setOf(ExtraModifiers.STATIC))) else setter!!.extra
         )
@@ -132,8 +125,8 @@ internal fun DFunction.asJava(containingClassName: String): DFunction {
         name = newName,
         type = type.asJava(),
         modifier = if(modifier.all{(_,v)-> v is KotlinModifier.Final} && isConstructor)
-            PlatformDependent(map = platformData.map{it to JavaModifier.Empty}.toMap())
-        else PlatformDependent(map = platformData.map{it to modifier.allValues.first()}.toMap()),
+            sourceSets.map{it to JavaModifier.Empty}.toMap()
+        else sourceSets.map{it to modifier.values.first()}.toMap(),
         parameters = listOfNotNull(receiver?.asJava()) + parameters.map { it.asJava() },
         receiver = null
     ) // TODO static if toplevel
@@ -156,11 +149,9 @@ internal fun DClass.asJava(): DClass = copy(
     properties = properties.map { it.asJava() },
     classlikes = classlikes.map { it.asJava() },
     generics = generics.map { it.asJava() },
-    supertypes = supertypes.copy(
-        map = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
-    ),
-    modifier = if (modifier.all{(_,v) -> v is KotlinModifier.Empty}) PlatformDependent(map = platformData.map{it to JavaModifier.Final}.toMap())
-    else PlatformDependent(map = platformData.map{it to modifier.allValues.first()}.toMap())
+    supertypes = supertypes.mapValues { it.value.map { it.possiblyAsJava() } },
+    modifier = if (modifier.all{(_,v) -> v is KotlinModifier.Empty}) sourceSets.map{it to JavaModifier.Final}.toMap()
+    else sourceSets.map{it to modifier.values.first()}.toMap()
 )
 
 private fun DTypeParameter.asJava(): DTypeParameter = copy(
@@ -185,9 +176,7 @@ internal fun DEnum.asJava(): DEnum = copy(
     },
     properties = properties.map { it.asJava() },
     classlikes = classlikes.map { it.asJava() },
-    supertypes = supertypes.copy(
-        map = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
-    )
+    supertypes = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
 //    , entries = entries.map { it.asJava() }
 )
 
@@ -198,27 +187,24 @@ internal fun DObject.asJava(): DObject = copy(
     properties = properties.map { it.asJava() } +
             DProperty(
                 name = "INSTANCE",
-                modifier = PlatformDependent(map = platformData.map{it to JavaModifier.Final}.toMap()),
+                modifier = sourceSets.map{it to JavaModifier.Final}.toMap(),
                 dri = dri.copy(callable = Callable("INSTANCE", null, emptyList())),
-                documentation = PlatformDependent.empty(),
-                sources = PlatformDependent.empty(),
-                visibility = PlatformDependent(
-                    platformData.map {
-                        it to JavaVisibility.Public
-                    }.toMap()
-                ),
+                documentation = emptyMap(),
+                sources = emptyMap(),
+                visibility = sourceSets.map {
+                    it to JavaVisibility.Public
+                }.toMap(),
                 type = TypeConstructor(dri, emptyList()),
                 setter = null,
                 getter = null,
-                platformData = platformData,
+                sourceSets = sourceSets,
                 receiver = null,
                 generics = emptyList(),
+                expectPresentInSet = expectPresentInSet,
                 extra = PropertyContainer.empty<DProperty>() + AdditionalModifiers(setOf(ExtraModifiers.STATIC))
             ),
     classlikes = classlikes.map { it.asJava() },
-    supertypes = supertypes.copy(
-        map = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
-    )
+    supertypes = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
 )
 
 internal fun DInterface.asJava(): DInterface = copy(
@@ -228,9 +214,7 @@ internal fun DInterface.asJava(): DInterface = copy(
     properties = emptyList(),
     classlikes = classlikes.map { it.asJava() }, // TODO: public static final class DefaultImpls with impls for methods
     generics = generics.map { it.asJava() },
-    supertypes = supertypes.copy(
-        map = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
-    )
+    supertypes = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
 )
 
 internal fun DAnnotation.asJava(): DAnnotation = copy(
diff --git a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
index 66328666..d737cedb 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
@@ -54,8 +54,8 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
         }
         if (c is WithSupertypes) {
             c.supertypes.map { (p, dris) ->
-                list(dris, prefix = " extends ", platformData = setOf(p)) {
-                    link(it.sureClassNames, it, platformData = setOf(p))
+                list(dris, prefix = " extends ", sourceSets = setOf(p)) {
+                    link(it.sureClassNames, it, sourceSets = setOf(p))
                 }
             }
         }
diff --git a/runners/cli/src/main/kotlin/cli/main.kt b/runners/cli/src/main/kotlin/cli/main.kt
index dca97ec6..607a58a7 100644
--- a/runners/cli/src/main/kotlin/cli/main.kt
+++ b/runners/cli/src/main/kotlin/cli/main.kt
@@ -65,6 +65,12 @@ class Arguments(val parser: DokkaArgumentsParser) : DokkaConfiguration.PassConfi
         ""
     )
 
+    override val sourceSetName: String by parser.stringOption(
+        listOf("-module"),
+        "Name of the source set",
+        "main"
+    )
+
     override val classpath: List<String> by parser.repeatableOption(
         listOf("-classpath"),
         "Classpath for symbol resolution"
@@ -75,6 +81,11 @@ class Arguments(val parser: DokkaArgumentsParser) : DokkaConfiguration.PassConfi
         "Source file or directory (allows many paths separated by the system path separator)"
     ) { SourceRootImpl(it) }
 
+    override val dependentSourceRoots: List<DokkaConfiguration.SourceRoot> by parser.repeatableOption(
+        listOf("-src"),
+        "Source file or directory (allows many paths separated by the system path separator)"
+    ) { SourceRootImpl(it) }
+
     override val samples: List<String> by parser.repeatableOption(
         listOf("-sample"),
         "Source root for samples"
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/ConfigurationExtractor.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/ConfigurationExtractor.kt
index 24bcd96d..393a3077 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/ConfigurationExtractor.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/ConfigurationExtractor.kt
@@ -13,72 +13,58 @@ import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.compile.AbstractCompile
 import org.jetbrains.dokka.ReflectDsl
+import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinSingleTargetExtension
-import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
-import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
+import org.jetbrains.kotlin.gradle.plugin.*
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.File
 import java.io.Serializable
 
 class ConfigurationExtractor(private val project: Project) {
 
-    fun extractConfiguration(targetName: String, variantName: String?) = if (project.isMultiplatformProject()) {
-        extractFromMultiPlatform(targetName, variantName)
-    } else {
-        extractFromSinglePlatform(variantName)
-    }
-
-    fun extractFromSinglePlatform(variantName: String? = null): PlatformData? {
-        val target: KotlinTarget
-        try {
-            target = project.extensions.getByType(KotlinSingleTargetExtension::class.java).target
-        } catch (e: Throwable) {
-            when (e){
-                is UnknownDomainObjectException, is NoClassDefFoundError, is ClassNotFoundException ->
-                    return null
-                else -> throw e
+    fun extractConfiguration(targetName: String, variantName: String?) =
+        extractFromKotlinProject(targetName, variantName)
+
+    fun extractFromKotlinProject(sourceSetName: String, variantName: String?): PlatformData? {
+        val projectExtension = project.extensions.getByType(KotlinProjectExtension::class.java)
+        val sourceSet = projectExtension.sourceSets.findByName(sourceSetName)
+            ?: run { project.logger.error("No source set with name '$sourceSetName' found"); return null }
+        val compilation = when (projectExtension) {
+            is KotlinMultiplatformExtension -> projectExtension.targets.flatMap { it.compilations }
+                .first { it.kotlinSourceSets.contains(sourceSet) }
+            is KotlinSingleTargetExtension -> projectExtension.target.compilations.find {
+                it.kotlinSourceSets.contains(
+                    sourceSet
+                )
             }
-        }
-
-        return try {
-            PlatformData(null, getClasspath(target, variantName), getSourceSet(target, variantName), getPlatformName(target.platformType))
-        } catch(e: NoSuchMethodError){
-            null
-        }
+            else -> null
+        } ?: run { project.logger.error("No compilation found for set with name '$sourceSetName'"); return null }
+
+        val classpath = compilation.compileDependencyFiles.files.filter { it.exists() }
+        val dependencies = (compilation.allKotlinSourceSets - sourceSet).flatMap { it.kotlin.sourceDirectories }
+        return PlatformData(
+            sourceSetName,
+            classpath,
+            sourceSet.kotlin.sourceDirectories.filter { it.exists() }.toList(),
+            dependencies,
+            compilation.target.targetName
+        )
     }
 
-    private fun extractFromMultiPlatform(targetName: String, variantName: String?): PlatformData? =
-        try {
-            project.extensions.getByType(KotlinMultiplatformExtension::class.java).targets
-        } catch (e: Throwable) {
-            when (e){
-                is UnknownDomainObjectException, is NoClassDefFoundError, is ClassNotFoundException ->
-                    null
-                else -> throw e
-            }
-        }?.let {
-            val fixedName = if(targetName.toLowerCase() == "common") "metadata" else targetName.toLowerCase()
-            it.find { target -> target.name.toLowerCase() == fixedName }?.let { target ->
-                PlatformData(fixedName, getClasspath(target, variantName), getSourceSet(target, variantName), target.platformType.toString())
-            }
-        }
-
     fun extractFromJavaPlugin(): PlatformData? =
         project.convention.findPlugin(JavaPluginConvention::class.java)
             ?.run { sourceSets.findByName(SourceSet.MAIN_SOURCE_SET_NAME)?.allSource?.srcDirs }
-            ?.let { PlatformData(null, emptyList(), it.toList(), "") }
+            ?.let { PlatformData(null, emptyList(), it.toList(), emptyList(), "") }
 
-    fun extractFromKotlinTasks(kotlinTasks: List<Task>): PlatformData? =
+    fun extractFromKotlinTasks(passName: String, kotlinTasks: List<Task>): PlatformData? =
         try {
-            kotlinTasks.map { extractFromKotlinTask(it) }.let { platformDataList ->
-                PlatformData(null, platformDataList.flatMap { it.classpath }, platformDataList.flatMap { it.sourceRoots }, "")
-            }
+            kotlinTasks.find { it.toString() == passName }?.let { extractFromKotlinTask(it) }
         } catch (e: Throwable) {
-            when (e){
+            when (e) {
                 is UnknownDomainObjectException, is NoClassDefFoundError, is ClassNotFoundException ->
-                    extractFromKotlinTasksTheHardWay(kotlinTasks)
+                    extractFromKotlinTasksTheHardWay(passName, kotlinTasks)
                 else -> throw e
             }
         }
@@ -89,15 +75,23 @@ class ConfigurationExtractor(private val project: Project) {
                 .compilations
                 .find { it.compileKotlinTask == task }
         } catch (e: Throwable) {
-            when (e){
+            when (e) {
                 is UnknownDomainObjectException, is NoClassDefFoundError, is ClassNotFoundException ->
                     project.extensions.getByType(KotlinMultiplatformExtension::class.java).targets
                         .flatMap { it.compilations }.firstOrNull { it.compileKotlinTask == task }
                 else -> throw e
             }
-        }.let { PlatformData(task.name, getClasspath(it), getSourceSet(it), it?.platformType?.toString() ?: "") }
+        }.let {
+            PlatformData(
+                task.name,
+                getClasspath(it),
+                getSourceSet(it),
+                getDependentSourceSet(it),
+                it?.platformType?.toString() ?: ""
+            )
+        }
 
-    private fun extractFromKotlinTasksTheHardWay(kotlinTasks: List<Task>): PlatformData? {
+    private fun extractFromKotlinTasksTheHardWay(passName: String, kotlinTasks: List<Task>): PlatformData? {
         val allClasspath = mutableSetOf<File>()
         var allClasspathFileCollection: FileCollection = project.files()
         val allSourceRoots = mutableSetOf<File>()
@@ -116,8 +110,8 @@ class ConfigurationExtractor(private val project: Project) {
 
                 val taskClasspath: Iterable<File> =
                     (it["getClasspath", AbstractCompile::class].takeIfIsFunc()?.invoke()
-                            ?: it["compileClasspath", abstractKotlinCompileClz].takeIfIsProp()?.v()
-                            ?: it["getClasspath", abstractKotlinCompileClz]())
+                        ?: it["compileClasspath", abstractKotlinCompileClz].takeIfIsProp()?.v()
+                        ?: it["getClasspath", abstractKotlinCompileClz]())
 
                 if (taskClasspath is FileCollection) {
                     allClasspathFileCollection += taskClasspath
@@ -132,28 +126,35 @@ class ConfigurationExtractor(private val project: Project) {
         } catch (e: ResolveException) {
             mutableListOf()
         }
-        classpath.addAll (project.files(allClasspath).toList())
+        classpath.addAll(project.files(allClasspath).toList())
 
-        return PlatformData(null, classpath, allSourceRoots.toList(), "")
+        return PlatformData(null, classpath, allSourceRoots.toList(), emptyList(), "")
     }
 
     private fun getSourceSet(target: KotlinTarget, variantName: String? = null): List<File> =
-        if(variantName != null)
+        if (variantName != null)
             getSourceSet(getCompilation(target, variantName))
         else
             getSourceSet(getMainCompilation(target))
 
-    private fun getClasspath(target: KotlinTarget, variantName: String? = null): List<File> = if (target.isAndroidTarget()) {
-        if(variantName != null)
-            getClasspathFromAndroidTask(getCompilation(target, variantName))
-        else
-            getClasspathFromAndroidTask(getMainCompilation(target))
-    } else {
-        getClasspath(getMainCompilation(target))
-    }
+    private fun getClasspath(target: KotlinTarget, variantName: String? = null): List<File> =
+        if (target.isAndroidTarget()) {
+            if (variantName != null)
+                getClasspathFromAndroidTask(getCompilation(target, variantName))
+            else
+                getClasspathFromAndroidTask(getMainCompilation(target))
+        } else {
+            getClasspath(getMainCompilation(target))
+        }
 
     private fun getSourceSet(compilation: KotlinCompilation<*>?): List<File> = compilation
-        ?.allKotlinSourceSets
+        ?.kotlinSourceSets
+        ?.flatMap { it.kotlin.sourceDirectories }
+        ?.filter { it.exists() }
+        .orEmpty()
+
+    private fun getDependentSourceSet(compilation: KotlinCompilation<*>?): List<File> = compilation
+        ?.let { it.allKotlinSourceSets - it.kotlinSourceSets }
         ?.flatMap { it.kotlin.sourceDirectories }
         ?.filter { it.exists() }
         .orEmpty()
@@ -183,7 +184,7 @@ class ConfigurationExtractor(private val project: Project) {
 
     private fun getVariants(project: Project): Set<BaseVariant> {
         val androidExtension = project.extensions.getByName("android")
-        val baseVariants =  when (androidExtension) {
+        val baseVariants = when (androidExtension) {
             is AppExtension -> androidExtension.applicationVariants.toSet()
             is LibraryExtension -> {
                 androidExtension.libraryVariants.toSet() +
@@ -208,8 +209,11 @@ class ConfigurationExtractor(private val project: Project) {
     private fun getPlatformName(platform: KotlinPlatformType): String =
         if (platform == KotlinPlatformType.androidJvm) KotlinPlatformType.jvm.toString() else platform.toString()
 
-    data class PlatformData(val name: String?,
-                            val classpath: List<File>,
-                            val sourceRoots: List<File>,
-                            val platform: String) : Serializable
+    data class PlatformData(
+        val name: String?,
+        val classpath: List<File>,
+        val sourceRoots: List<File>,
+        val dependentSourceRoots: List<File>,
+        val platform: String
+    ) : Serializable
 }
\ No newline at end of file
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt
index 2018d3af..356661da 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt
@@ -1,6 +1,5 @@
 package org.jetbrains.dokka.gradle
 
-import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import org.gradle.api.*
 import org.gradle.api.artifacts.Configuration
@@ -24,7 +23,7 @@ import java.util.function.BiConsumer
 
 open class DokkaTask : DefaultTask(), Configurable {
     private val ANDROID_REFERENCE_URL = Builder("https://developer.android.com/reference/").build()
-    private val GLOBAL_PLATFORM_NAME = "global" // Used for copying perPackageOptions to other platforms
+    private val GLOBAL_CONFIGURATION_NAME = "global" // Used for copying perPackageOptions to other platforms
 
     @Suppress("MemberVisibilityCanBePrivate")
     fun defaultKotlinTasks(): List<Task> = with(ReflectDsl) {
@@ -69,10 +68,10 @@ open class DokkaTask : DefaultTask(), Configurable {
     @Classpath
     lateinit var pluginsConfig: Configuration
 
-    var multiplatform: NamedDomainObjectContainer<GradlePassConfigurationImpl>
+    var dokkaSourceSets: NamedDomainObjectContainer<GradlePassConfigurationImpl>
         @Suppress("UNCHECKED_CAST")
-        @Nested get() = (DslObject(this).extensions.getByName(MULTIPLATFORM_EXTENSION_NAME) as NamedDomainObjectContainer<GradlePassConfigurationImpl>)
-        internal set(value) = DslObject(this).extensions.add(MULTIPLATFORM_EXTENSION_NAME, value)
+        @Nested get() = (DslObject(this).extensions.getByName(SOURCE_SETS_EXTENSION_NAME) as NamedDomainObjectContainer<GradlePassConfigurationImpl>)
+        internal set(value) = DslObject(this).extensions.add(SOURCE_SETS_EXTENSION_NAME, value)
 
     var configuration: GradlePassConfigurationImpl
         @Suppress("UNCHECKED_CAST")
@@ -188,7 +187,7 @@ open class DokkaTask : DefaultTask(), Configurable {
     }
 
     internal fun getConfiguration(): GradleDokkaConfigurationImpl {
-        val globalConfig = multiplatform.toList().find { it.name.toLowerCase() == GLOBAL_PLATFORM_NAME }
+        val globalConfig = dokkaSourceSets.toList().find { it.name.toLowerCase() == GLOBAL_CONFIGURATION_NAME }
         val defaultModulesConfiguration = collectConfigurations()
             .map { defaultPassConfiguration(it, globalConfig) }
         return GradleDokkaConfigurationImpl().apply {
@@ -204,27 +203,28 @@ open class DokkaTask : DefaultTask(), Configurable {
     }
 
     private fun collectConfigurations() =
-        if (this.isMultiplatformProject()) collectMultiplatform() else listOf(collectSinglePlatform(configuration))
+        if (this.dokkaSourceSets.isNotEmpty()) collectMultipassConfiguration() else listOf(collectSinglePassConfiguration(configuration))
 
-    private fun collectMultiplatform() = multiplatform
-        .filterNot { it.name.toLowerCase() == GLOBAL_PLATFORM_NAME }
-        .map { collectSinglePlatform(it) }
+    private fun collectMultipassConfiguration() = dokkaSourceSets
+        .filterNot { it.name.toLowerCase() == GLOBAL_CONFIGURATION_NAME }
+        .map { collectSinglePassConfiguration(it) }
 
-    private fun collectSinglePlatform(config: GradlePassConfigurationImpl): GradlePassConfigurationImpl {
-        val userConfig = config.let {
+    private fun collectSinglePassConfiguration(config: GradlePassConfigurationImpl): GradlePassConfigurationImpl {
+        val userConfig = config
+        /*.let {
             if (it.collectKotlinTasks != null) {
                 configExtractor.extractFromKotlinTasks(extractKotlinCompileTasks(it.collectKotlinTasks!!))
                     ?.let { platformData -> mergeUserConfigurationAndPlatformData(it, platformData) } ?: it
             } else {
                 it
             }
-        }
+        }*/
 
         if (disableAutoconfiguration) return userConfig
 
         val baseConfig = configExtractor.extractConfiguration(userConfig.name, userConfig.androidVariant)
             ?.let { mergeUserConfigurationAndPlatformData(userConfig, it) }
-            ?: if (this.isMultiplatformProject()) {
+            ?: if (this.dokkaSourceSets.isNotEmpty()) {
                 if (outputDiagnosticInfo)
                     logger.warn(
                         "Could not find target with name: ${userConfig.name} in Kotlin Gradle Plugin, " +
@@ -233,7 +233,7 @@ open class DokkaTask : DefaultTask(), Configurable {
                 userConfig
             } else {
                 logger.warn("Could not find target with name: ${userConfig.name} in Kotlin Gradle Plugin")
-                collectFromSinglePlatformOldPlugin()
+                collectFromSinglePlatformOldPlugin(userConfig.name)
             }
 
         return if (subProjects.isNotEmpty()) {
@@ -256,8 +256,8 @@ open class DokkaTask : DefaultTask(), Configurable {
         }
     }
 
-    private fun collectFromSinglePlatformOldPlugin() =
-        configExtractor.extractFromKotlinTasks(kotlinTasks)
+    private fun collectFromSinglePlatformOldPlugin(name: String) =
+        configExtractor.extractFromKotlinTasks(name, kotlinTasks)
             ?.let { mergeUserConfigurationAndPlatformData(configuration, it) }
             ?: configExtractor.extractFromJavaPlugin()
                 ?.let { mergeUserConfigurationAndPlatformData(configuration, it) }
@@ -269,6 +269,7 @@ open class DokkaTask : DefaultTask(), Configurable {
     ) =
         userConfig.copy().apply {
             sourceRoots.addAll(userConfig.sourceRoots.union(autoConfig.sourceRoots.toSourceRoots()).distinct())
+            dependentSourceRoots.addAll(userConfig.dependentSourceRoots.union(autoConfig.dependentSourceRoots.toSourceRoots()).distinct())
             classpath = userConfig.classpath.union(autoConfig.classpath.map { it.absolutePath }).distinct()
             if (userConfig.platform == null && autoConfig.platform != "")
                 platform = autoConfig.platform
@@ -281,11 +282,10 @@ open class DokkaTask : DefaultTask(), Configurable {
         if (config.moduleName == "") {
             config.moduleName = project.name
         }
-        if (config.targets.isEmpty() && multiplatform.isNotEmpty()) {
-            config.targets = listOf(config.name)
+        if (config.sourceSetName.isEmpty()) {
+            config.sourceSetName = config.platform ?: config.name
         }
-        config.classpath =
-            (config.classpath as List<Any>).map { it.toString() }.distinct() // Workaround for Groovy's GStringImpl
+        config.classpath = (config.classpath as List<Any>).map { it.toString() }.distinct() // Workaround for Groovy's GStringImpl
         config.sourceRoots = config.sourceRoots.distinct().toMutableList()
         config.samples = config.samples.map { project.file(it).absolutePath }
         config.includes = config.includes.map { project.file(it).absolutePath }
@@ -293,7 +293,7 @@ open class DokkaTask : DefaultTask(), Configurable {
         if (project.isAndroidProject() && !config.noAndroidSdkLink) { // TODO: introduce Android as a separate Dokka platform?
             config.externalDocumentationLinks.add(ANDROID_REFERENCE_URL)
         }
-        if (config.platform != null && config.platform.toString().isNotEmpty()) {
+        if (config.platform != null && config.platform.toString().isNotBlank()) {
             config.analysisPlatform = dokkaPlatformFromString(config.platform.toString())
         }
         if (globalConfig != null) {
@@ -339,5 +339,4 @@ open class DokkaTask : DefaultTask(), Configurable {
             null
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt
index 570da5f3..9719686e 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt
@@ -27,7 +27,9 @@ class GradleSourceRootImpl: SourceRoot, Serializable {
 open class GradlePassConfigurationImpl(@Transient val name: String = ""): PassConfiguration {
     @Input @Optional override var classpath: List<String> = emptyList()
     @Input override var moduleName: String = ""
+    @Input override var sourceSetName: String = ""
     @Input override var sourceRoots: MutableList<SourceRoot> = mutableListOf()
+    @Input override var dependentSourceRoots: MutableList<SourceRoot> = mutableListOf()
     @Input override var samples: List<String> = emptyList()
     @Input override var includes: List<String> = emptyList()
     @Input override var includeNonPublic: Boolean = false
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt
index 1d93a310..fea0d864 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/main.kt
@@ -9,7 +9,7 @@ import java.io.InputStream
 import java.util.*
 
 internal const val CONFIGURATION_EXTENSION_NAME = "configuration"
-internal const val MULTIPLATFORM_EXTENSION_NAME = "multiplatform"
+internal const val SOURCE_SETS_EXTENSION_NAME = "dokkaSourceSets"
 internal const val DOKKA_TASK_NAME = "dokka"
 internal const val DOKKA_COLLECTOR_TASK_NAME = "dokkaCollector"
 
@@ -45,7 +45,7 @@ open class DokkaPlugin : Plugin<Project> {
             project.tasks.create(DOKKA_TASK_NAME, taskClass)
         }
         project.tasks.withType(taskClass) { task ->
-            task.multiplatform = project.container(GradlePassConfigurationImpl::class.java)
+            task.dokkaSourceSets = project.container(GradlePassConfigurationImpl::class.java)
             task.configuration = GradlePassConfigurationImpl()
             task.dokkaRuntime = runtimeConfiguration
             task.pluginsConfig = pluginsConfiguration
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt
index 31892e8e..3369a640 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt
@@ -16,16 +16,4 @@ fun Project.isAndroidProject() = try {
     false
 }
 
-fun Project.isMultiplatformProject() = try {
-    project.extensions.getByType(KotlinMultiplatformExtension::class.java)
-    true
-} catch(e: UnknownDomainObjectException) {
-    false
-} catch (e: NoClassDefFoundError){
-    false
-} catch(e: ClassNotFoundException) {
-    false
-}
-
-fun KotlinTarget.isAndroidTarget() = this.platformType == KotlinPlatformType.androidJvm
-fun DokkaTask.isMultiplatformProject() = this.multiplatform.isNotEmpty()
\ No newline at end of file
+fun KotlinTarget.isAndroidTarget() = this.platformType == KotlinPlatformType.androidJvm
\ No newline at end of file
diff --git a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt
index 24d95ab4..ac22eb57 100644
--- a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt
+++ b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt
@@ -83,6 +83,9 @@ abstract class AbstractDokkaMojo : AbstractMojo() {
         override var suppress: Boolean = false
     }
 
+    @Parameter(required = true, defaultValue = "\${project.sourceSet}")
+    var sourceSetName: String = ""
+
     @Parameter(required = true, defaultValue = "\${project.compileSourceRoots}")
     var sourceDirectories: List<String> = emptyList()
 
@@ -201,7 +204,9 @@ abstract class AbstractDokkaMojo : AbstractMojo() {
 
         val passConfiguration = PassConfigurationImpl(
             classpath = classpath,
-            sourceRoots = sourceDirectories.map { SourceRootImpl(it) } + sourceRoots.map { SourceRootImpl(path = it.path) },
+            sourceSetName = sourceSetName,
+            sourceRoots = sourceDirectories.map { SourceRootImpl(it) },
+            dependentSourceRoots = sourceRoots.map { SourceRootImpl(path = it.path) },
             samples = samples,
             includes = includes,
             collectInheritedExtensionsFromLibraries = collectInheritedExtensionsFromLibraries, // TODO: Should we implement this?
diff --git a/testApi/src/main/kotlin/testApi/context/MockContext.kt b/testApi/src/main/kotlin/testApi/context/MockContext.kt
index 5236f1f4..11520280 100644
--- a/testApi/src/main/kotlin/testApi/context/MockContext.kt
+++ b/testApi/src/main/kotlin/testApi/context/MockContext.kt
@@ -2,7 +2,8 @@ package org.jetbrains.dokka.testApi.context
 
 import org.jetbrains.dokka.DokkaConfiguration
 import org.jetbrains.dokka.EnvironmentAndFacade
-import org.jetbrains.dokka.pages.PlatformData
+import org.jetbrains.dokka.model.SourceSetCache
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.DokkaPlugin
 import org.jetbrains.dokka.plugability.ExtensionPoint
@@ -15,8 +16,9 @@ import kotlin.reflect.full.memberProperties
 class MockContext(
     vararg extensions: Pair<ExtensionPoint<*>, (DokkaContext) -> Any>,
     private val testConfiguration: DokkaConfiguration? = null,
-    private val testPlatforms: Map<PlatformData, EnvironmentAndFacade>? = null,
-    private val unusedExtensionPoints: List<ExtensionPoint<*>>? = null
+    private val testSourceSets: Map<SourceSetData, EnvironmentAndFacade>? = null,
+    private val unusedExtensionPoints: List<ExtensionPoint<*>>? = null,
+    override val sourceSetCache: SourceSetCache
 ) : DokkaContext {
     private val extensionMap by lazy {
         extensions.groupBy(Pair<ExtensionPoint<*>, (DokkaContext) -> Any>::first) {
@@ -39,8 +41,8 @@ class MockContext(
     override val configuration: DokkaConfiguration
         get() = testConfiguration ?: throw IllegalStateException("This mock context doesn't provide configuration")
 
-    override val platforms: Map<PlatformData, EnvironmentAndFacade>
-        get() = testPlatforms ?: throw IllegalStateException("This mock context doesn't provide platforms data")
+    override val platforms: Map<SourceSetData, EnvironmentAndFacade>
+        get() = testSourceSets ?: throw IllegalStateException("This mock context doesn't provide platforms data")
     override val unusedPoints: Collection<ExtensionPoint<*>>
         get() = unusedExtensionPoints
             ?: throw IllegalStateException("This mock context doesn't provide unused extension points")
diff --git a/testApi/src/main/kotlin/testApi/testRunner/DokkaTestGenerator.kt b/testApi/src/main/kotlin/testApi/testRunner/DokkaTestGenerator.kt
index 0e77344d..802bfd93 100644
--- a/testApi/src/main/kotlin/testApi/testRunner/DokkaTestGenerator.kt
+++ b/testApi/src/main/kotlin/testApi/testRunner/DokkaTestGenerator.kt
@@ -3,7 +3,8 @@ package org.jetbrains.dokka.testApi.testRunner
 import org.jetbrains.dokka.DokkaConfiguration
 import org.jetbrains.dokka.DokkaGenerator
 import org.jetbrains.dokka.EnvironmentAndFacade
-import org.jetbrains.dokka.pages.PlatformData
+import org.jetbrains.dokka.model.SourceSetCache
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.plugability.DokkaPlugin
 import org.jetbrains.dokka.utilities.DokkaLogger
 
@@ -16,11 +17,15 @@ internal class DokkaTestGenerator(
 
     fun generate() = with(testMethods) {
         val dokkaGenerator = DokkaGenerator(configuration, logger)
+        val sourceSetsCache = SourceSetCache()
 
-        val platforms: Map<PlatformData, EnvironmentAndFacade> = dokkaGenerator.setUpAnalysis(configuration)
+        val platforms: Map<SourceSetData, EnvironmentAndFacade> = dokkaGenerator.setUpAnalysis(
+            configuration,
+            sourceSetsCache
+        )
         analysisSetupStage(platforms)
 
-        val context = dokkaGenerator.initializePlugins(configuration, logger, platforms, pluginOverrides)
+        val context = dokkaGenerator.initializePlugins(configuration, logger, platforms, sourceSetsCache, pluginOverrides)
         pluginsSetupStage(context)
 
         val modulesFromPlatforms = dokkaGenerator.createDocumentationModels(platforms, context)
diff --git a/testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt b/testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt
index 6c132d3c..43d99dad 100644
--- a/testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt
+++ b/testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt
@@ -3,8 +3,8 @@ package org.jetbrains.dokka.testApi.testRunner
 import com.intellij.openapi.application.PathManager
 import org.jetbrains.dokka.*
 import org.jetbrains.dokka.model.DModule
+import org.jetbrains.dokka.model.SourceSetData
 import org.jetbrains.dokka.pages.ModulePageNode
-import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.pages.RootPageNode
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.DokkaPlugin
@@ -104,7 +104,7 @@ abstract class AbstractCoreTest {
     }
 
     protected class TestBuilder {
-        var analysisSetupStage: (Map<PlatformData, EnvironmentAndFacade>) -> Unit = {}
+        var analysisSetupStage: (Map<SourceSetData, EnvironmentAndFacade>) -> Unit = {}
         var pluginsSetupStage: (DokkaContext) -> Unit = {}
         var documentablesCreationStage: (List<DModule>) -> Unit = {}
         var documentablesFirstTransformationStep: (List<DModule>) -> Unit = {}
@@ -167,8 +167,10 @@ abstract class AbstractCoreTest {
     @DokkaConfigurationDsl
     protected class DokkaPassConfigurationBuilder(
         var moduleName: String = "root",
+        var sourceSetName: String = "main",
         var classpath: List<String> = emptyList(),
         var sourceRoots: List<String> = emptyList(),
+        var dependentSourceRoots: List<String> = emptyList(),
         var samples: List<String> = emptyList(),
         var includes: List<String> = emptyList(),
         var includeNonPublic: Boolean = true,
@@ -192,8 +194,10 @@ abstract class AbstractCoreTest {
     ) {
         fun build() = PassConfigurationImpl(
             moduleName = moduleName,
+            sourceSetName = sourceSetName,
             classpath = classpath,
             sourceRoots = sourceRoots.map { SourceRootImpl(it) },
+            dependentSourceRoots = dependentSourceRoots.map { SourceRootImpl(it) },
             samples = samples,
             includes = includes,
             includeNonPublic = includeNonPublic,
@@ -235,7 +239,7 @@ abstract class AbstractCoreTest {
 }
 
 data class TestMethods(
-    val analysisSetupStage: (Map<PlatformData, EnvironmentAndFacade>) -> Unit,
+    val analysisSetupStage: (Map<SourceSetData, EnvironmentAndFacade>) -> Unit,
     val pluginsSetupStage: (DokkaContext) -> Unit,
     val documentablesCreationStage: (List<DModule>) -> Unit,
     val documentablesFirstTransformationStep: (List<DModule>) -> Unit,
-- 
cgit 


From 3aeb65472be150a6098f2fac17dbdf0bb2a40013 Mon Sep 17 00:00:00 2001
From: Marcin Aman <maman@virtuslab.com>
Date: Thu, 7 May 2020 17:10:10 +0200
Subject: Missing generics on class. Add generics to annotation #834

---
 core/src/main/kotlin/links/DRI.kt                  |  71 ++++++++++---
 core/src/main/kotlin/model/Documentable.kt         |   5 +-
 .../kotlin/signatures/KotlinSignatureProvider.kt   |  16 +--
 .../documentables/DefaultDocumentableMerger.kt     |   3 +-
 .../documentables/DocumentableVisibilityFilter.kt  |   1 +
 .../DefaultDescriptorToDocumentableTranslator.kt   |  21 ++--
 .../psi/DefaultPsiToDocumentableTranslator.kt      |  10 +-
 plugins/base/src/test/kotlin/basic/DRITest.kt      | 118 ++++++++++++++++++++-
 plugins/base/src/test/kotlin/markdown/LinkTest.kt  |  36 ++++++-
 plugins/base/src/test/kotlin/model/ClassesTest.kt  |  27 ++++-
 plugins/base/src/test/kotlin/model/JavaTest.kt     |   1 -
 .../kotlin/converters/KotlinToJavaConverter.kt     |   7 +-
 .../kotlin/signatures/JavaSignatureProvider.kt     |   2 +-
 13 files changed, 271 insertions(+), 47 deletions(-)

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/core/src/main/kotlin/links/DRI.kt b/core/src/main/kotlin/links/DRI.kt
index 3d9012ec..1c823d92 100644
--- a/core/src/main/kotlin/links/DRI.kt
+++ b/core/src/main/kotlin/links/DRI.kt
@@ -1,9 +1,6 @@
 package org.jetbrains.dokka.links
 
-import com.intellij.psi.PsiClass
-import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiMethod
-import com.intellij.psi.PsiParameter
+import com.intellij.psi.*
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
@@ -20,17 +17,15 @@ data class DRI(
     val packageName: String? = null,
     val classNames: String? = null,
     val callable: Callable? = null,
-    val target: Int? = null,
-    val genericTarget: Int? = null,
+    val target: DriTarget = PointingToDeclaration,
     val extra: String? = null
 ) {
     override fun toString(): String =
-        "${packageName.orEmpty()}/${classNames.orEmpty()}/${callable?.name.orEmpty()}/${callable?.signature().orEmpty()}/${target?.toString().orEmpty()}/${extra.orEmpty()}"
+        "${packageName.orEmpty()}/${classNames.orEmpty()}/${callable?.name.orEmpty()}/${callable?.signature().orEmpty()}/$target/${extra.orEmpty()}"
 
     companion object {
         fun from(descriptor: DeclarationDescriptor) = descriptor.parentsWithSelf.run {
             val callable = firstIsInstanceOrNull<CallableDescriptor>()
-            val params = callable?.let { listOfNotNull(it.extensionReceiverParameter) + it.valueParameters }.orEmpty()
             DRI(
                 firstIsInstanceOrNull<PackageFragmentDescriptor>()?.fqName?.asString(),
                 (filterIsInstance<ClassDescriptor>() + filterIsInstance<TypeAliasDescriptor>()).toList()
@@ -38,20 +33,18 @@ data class DRI(
                     ?.asReversed()
                     ?.joinToString(separator = ".") { it.name.asString() },
                 callable?.let { Callable.from(it) },
-                firstIsInstanceOrNull<ParameterDescriptor>()?.let { params.indexOf(it) },
-                null
+                DriTarget.from(descriptor)
             )
         }
 
         fun from(psi: PsiElement) = psi.parentsWithSelf.run {
             val callable = firstIsInstanceOrNull<PsiMethod>()
-            val params = (callable?.parameterList?.parameters).orEmpty()
             val classes = filterIsInstance<PsiClass>().toList()
             DRI(
                 classes.lastOrNull()?.qualifiedName?.substringBeforeLast('.', ""),
                 classes.toList().takeIf { it.isNotEmpty() }?.asReversed()?.mapNotNull { it.name }?.joinToString("."),
                 callable?.let { Callable.from(it) },
-                firstIsInstanceOrNull<PsiParameter>()?.let { params.indexOf(it) }
+                DriTarget.from(psi)
             )
         }
         val topLevel = DRI()
@@ -63,11 +56,12 @@ val DriOfAny = DRI("kotlin", "Any")
 
 fun DRI.withClass(name: String) = copy(classNames = if (classNames.isNullOrBlank()) name else "$classNames.$name")
 
+fun DRI.withTargetToDeclaration() = copy(target = PointingToDeclaration)
+
 val DRI.parent: DRI
     get() = when {
         extra != null -> copy(extra = null)
-        genericTarget != null -> copy(genericTarget = null)
-        target != null -> copy(target = null)
+        target != PointingToDeclaration -> copy(target = PointingToDeclaration)
         callable != null -> copy(callable = null)
         classNames != null -> copy(classNames = classNames.substringBeforeLast(".", "").takeIf { it.isNotBlank() })
         else -> DRI.topLevel
@@ -167,8 +161,53 @@ object StarProjection : TypeReference() {
     override fun toString() = "*"
 }
 
-private operator fun <T> List<T>.component6(): T = get(5)
-
 private val KotlinType.constructorName
     get() = constructor.declarationDescriptor?.fqNameSafe?.asString()
 
+sealed class DriTarget {
+    override fun toString(): String = this.javaClass.simpleName
+
+    companion object {
+        fun from(descriptor: DeclarationDescriptor): DriTarget = descriptor.parentsWithSelf.run {
+            return when(descriptor){
+                is TypeParameterDescriptor -> PointingToGenericParameters(descriptor.index)
+                else -> {
+                    val callable = firstIsInstanceOrNull<CallableDescriptor>()
+                    val params = callable?.let { listOfNotNull(it.extensionReceiverParameter) + it.valueParameters }.orEmpty()
+                    val parameterDescriptor = firstIsInstanceOrNull<ParameterDescriptor>()
+
+                    parameterDescriptor?.let { PointingToCallableParameters(params.indexOf(it)) }
+                        ?: PointingToDeclaration
+                }
+            }
+        }
+
+        fun from(psi: PsiElement): DriTarget = psi.parentsWithSelf.run {
+            return when(psi) {
+                is PsiTypeParameter -> PointingToGenericParameters(psi.index)
+                else -> firstIsInstanceOrNull<PsiParameter>()?.let {
+                    val callable = firstIsInstanceOrNull<PsiMethod>()
+                    val params = (callable?.parameterList?.parameters).orEmpty()
+                    PointingToCallableParameters(params.indexOf(it))
+                } ?: PointingToDeclaration
+            }
+        }
+    }
+}
+
+data class PointingToGenericParameters(val parameterIndex: Int) : DriTarget() {
+    override fun toString(): String = "PointingToGenericParameters($parameterIndex)"
+}
+
+object PointingToDeclaration: DriTarget()
+
+data class PointingToCallableParameters(val parameterIndex: Int): DriTarget(){
+    override fun toString(): String = "PointingToCallableParameters($parameterIndex)"
+}
+
+fun DriTarget.nextTarget(): DriTarget = when(this){
+        is PointingToGenericParameters -> PointingToGenericParameters(this.parameterIndex+1)
+        is PointingToCallableParameters -> PointingToCallableParameters(this.parameterIndex+1)
+        else -> this
+    }
+
diff --git a/core/src/main/kotlin/model/Documentable.kt b/core/src/main/kotlin/model/Documentable.kt
index 85487725..9f17638c 100644
--- a/core/src/main/kotlin/model/Documentable.kt
+++ b/core/src/main/kotlin/model/Documentable.kt
@@ -263,9 +263,10 @@ data class DAnnotation(
     override val visibility: SourceSetDependent<Visibility>,
     override val companion: DObject?,
     override val constructors: List<DFunction>,
+    override val generics: List<DTypeParameter>,
     override val sourceSets: List<SourceSetData>,
     override val extra: PropertyContainer<DAnnotation> = PropertyContainer.empty()
-) : DClasslike(), WithCompanion, WithConstructors, WithExtraProperties<DAnnotation> {
+) : DClasslike(), WithCompanion, WithConstructors, WithExtraProperties<DAnnotation>, WithGenerics {
     override val children: List<Documentable>
         get() = (functions + properties + classlikes + constructors) as List<Documentable>
 
@@ -344,7 +345,7 @@ data class DTypeAlias(
 
 sealed class Projection
 sealed class Bound : Projection()
-data class OtherParameter(val name: String) : Bound()
+data class OtherParameter(val declarationDRI: DRI, val name: String) : Bound()
 object Star : Projection()
 data class TypeConstructor(
     val dri: DRI,
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
index 3836f45d..617af959 100644
--- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
+++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
@@ -2,11 +2,10 @@ package org.jetbrains.dokka.base.signatures
 
 import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
 import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
-import org.jetbrains.dokka.links.DRI
-import org.jetbrains.dokka.links.DriOfAny
-import org.jetbrains.dokka.links.DriOfUnit
-import org.jetbrains.dokka.links.sureClassNames
+import org.jetbrains.dokka.links.*
 import org.jetbrains.dokka.model.*
+import org.jetbrains.dokka.model.Nullable
+import org.jetbrains.dokka.model.TypeConstructor
 import org.jetbrains.dokka.model.properties.WithExtraProperties
 import org.jetbrains.dokka.pages.ContentKind
 import org.jetbrains.dokka.pages.ContentNode
@@ -71,6 +70,11 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
                 is DAnnotation -> text("annotation class ")
             }
             link(c.name!!, c.dri)
+            if(c is WithGenerics){
+                list(c.generics, prefix = "<", suffix = "> ") {
+                    +buildSignature(it)
+                }
+            }
             if (c is DClass) {
                 val pConstructor = c.constructors.singleOrNull { it.extra[PrimaryConstructorExtra] != null }
                 list(pConstructor?.parameters.orEmpty(), "(", ")", ",", pConstructor?.sourceSets.orEmpty().toSet()) {
@@ -158,7 +162,7 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
         }
 
     private fun signature(t: DTypeParameter) = contentBuilder.contentFor(t) {
-        link(t.name, t.dri)
+        link(t.name, t.dri.withTargetToDeclaration())
         list(t.bounds, prefix = " : ") {
             signatureForProjection(it)
         }
@@ -166,7 +170,7 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
 
     private fun PageContentBuilder.DocumentableContentBuilder.signatureForProjection(p: Projection): Unit =
         when (p) {
-            is OtherParameter -> text(p.name)
+            is OtherParameter -> link(p.name, p.declarationDRI)
 
             is TypeConstructor -> if (p.function)
                 +funType(mainDRI.single(), mainPlatformData, p)
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
index 862f9240..1b8fa299 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
@@ -175,7 +175,8 @@ fun DAnnotation.mergeWith(other: DAnnotation): DAnnotation = copy(
     expectPresentInSet = expectPresentInSet ?: other.expectPresentInSet,
     sources = sources+ other.sources,
     visibility = visibility + other.visibility,
-    sourceSets = sourceSets + other.sourceSets
+    sourceSets = sourceSets + other.sourceSets,
+    generics = merge(generics + other.generics, DTypeParameter::mergeWith)
 ).mergeExtras(this, other)
 
 fun DParameter.mergeWith(other: DParameter): DParameter = copy(
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt b/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt
index 6fdce3a8..d15ec791 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt
@@ -265,6 +265,7 @@ internal class DocumentableVisibilityFilter(val context: DokkaContext) : PreMerg
                                 visibility.filtered(filteredPlatforms),
                                 companion,
                                 constructors,
+                                generics,
                                 filteredPlatforms,
                                 extra
                             )
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index 7cc96a24..a62d9a0b 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -1,10 +1,11 @@
 package org.jetbrains.dokka.base.translators.descriptors
 
 import org.jetbrains.dokka.analysis.DokkaResolutionFacade
+import org.jetbrains.dokka.links.*
 import org.jetbrains.dokka.links.Callable
-import org.jetbrains.dokka.links.DRI
-import org.jetbrains.dokka.links.withClass
 import org.jetbrains.dokka.model.*
+import org.jetbrains.dokka.model.Nullable
+import org.jetbrains.dokka.model.TypeConstructor
 import org.jetbrains.dokka.model.doc.*
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.dokka.parsers.MarkdownParser
@@ -127,7 +128,7 @@ private class DokkaDescriptorVisitor(
             visibility = descriptor.visibility.toDokkaVisibility().toSourceSetDependent(),
             supertypes = info.supertypes.toSourceSetDependent(),
             documentation = info.docs,
-            generics = descriptor.typeConstructor.parameters.map { it.toTypeParameter() },
+            generics = descriptor.declaredTypeParameters.map { it.toTypeParameter() },
             companion = descriptor.companion(driWithPlatform),
             sourceSets = listOf(sourceSet),
             extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
@@ -216,6 +217,7 @@ private class DokkaDescriptorVisitor(
             extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations()),
             companion = descriptor.companionObjectDescriptor?.let { objectDescriptor(it, driWithPlatform) },
             visibility = descriptor.visibility.toDokkaVisibility().toSourceSetDependent(),
+            generics = descriptor.declaredTypeParameters.map { it.toTypeParameter() },
             constructors = descriptor.constructors.map { visitConstructorDescriptor(it, driWithPlatform) },
             sources = descriptor.createSources()
         )
@@ -245,7 +247,7 @@ private class DokkaDescriptorVisitor(
             expectPresentInSet = sourceSet.takeIf { isExpect },
             visibility = descriptor.visibility.toDokkaVisibility().toSourceSetDependent(),
             supertypes = info.supertypes.toSourceSetDependent(),
-            generics = descriptor.typeConstructor.parameters.map { it.toTypeParameter() },
+            generics = descriptor.declaredTypeParameters.map { it.toTypeParameter() },
             documentation = info.docs,
             modifier =   descriptor.modifier().toSourceSetDependent(),
             companion = descriptor.companion(driWithPlatform),
@@ -364,7 +366,7 @@ private class DokkaDescriptorVisitor(
         descriptor: ReceiverParameterDescriptor,
         parent: DRIWithPlatformInfo
     ) = DParameter(
-        dri = parent.dri.copy(target = 0),
+        dri = parent.dri.copy(target = PointingToDeclaration),
         name = null,
         type = descriptor.type.toBound(),
         expectPresentInSet = null,
@@ -383,7 +385,7 @@ private class DokkaDescriptorVisitor(
 
         fun PropertyDescriptor.asParameter(parent: DRI) =
             DParameter(
-                parent.copy(target = 1),
+                parent.copy(target = PointingToCallableParameters(parameterIndex = 1)),
                 this.name.asString(),
                 type = this.type.toBound(),
                 expectPresentInSet = sourceSet.takeIf { isExpect },
@@ -444,7 +446,7 @@ private class DokkaDescriptorVisitor(
 
     private fun parameter(index: Int, descriptor: ValueParameterDescriptor, parent: DRIWithPlatformInfo) =
         DParameter(
-            dri = parent.dri.copy(target = index + 1),
+            dri = parent.dri.copy(target = PointingToCallableParameters(index)),
             name = descriptor.name.asString(),
             type = descriptor.type.toBound(),
             expectPresentInSet = null,
@@ -518,7 +520,10 @@ private class DokkaDescriptorVisitor(
         )
 
     private fun KotlinType.toBound(): Bound = when (val ctor = constructor.declarationDescriptor) {
-        is TypeParameterDescriptor -> OtherParameter(ctor.name.asString()).let {
+        is TypeParameterDescriptor -> OtherParameter(
+            declarationDRI = DRI.from(ctor.containingDeclaration),
+            name = ctor.name.asString()
+        ).let {
             if (isMarkedNullable) Nullable(it) else it
         }
         else -> TypeConstructor(
diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
index ca8055c8..ab4a84f6 100644
--- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
@@ -6,6 +6,7 @@ import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.psi.*
 import com.intellij.psi.impl.source.PsiClassReferenceType
 import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.links.nextTarget
 import org.jetbrains.dokka.links.withClass
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.properties.PropertyContainer
@@ -159,6 +160,7 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                         visibility,
                         null,
                         constructors.map { parseFunction(it, true) },
+                        mapTypeParameters(dri),
                         listOf(sourceSetData),
                         PropertyContainer.empty<DAnnotation>() + annotations.toList().toExtra()
                     )
@@ -238,9 +240,9 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                 dri,
                 if (isConstructor) "<init>" else psi.name,
                 isConstructor,
-                psi.parameterList.parameters.mapIndexed { index, psiParameter ->
+                psi.parameterList.parameters.map { psiParameter ->
                     DParameter(
-                        dri.copy(target = index + 1),
+                        dri.copy(target = dri.target.nextTarget()),
                         psiParameter.name,
                         javadocParser.parseDocumentation(psiParameter).toPlatformDependant(),
                         null,
@@ -321,9 +323,9 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                 if (bounds.isEmpty()) emptyList() else bounds.mapNotNull {
                     (it as? PsiClassType)?.let { classType -> Nullable(getBound(classType)) }
                 }
-            return typeParameters.mapIndexed { index, type ->
+            return typeParameters.map { type ->
                 DTypeParameter(
-                    dri.copy(genericTarget = index),
+                    dri.copy(target = dri.target.nextTarget()),
                     type.name.orEmpty(),
                     javadocParser.parseDocumentation(type).toPlatformDependant(),
                     null,
diff --git a/plugins/base/src/test/kotlin/basic/DRITest.kt b/plugins/base/src/test/kotlin/basic/DRITest.kt
index e85ca30e..1ac05177 100644
--- a/plugins/base/src/test/kotlin/basic/DRITest.kt
+++ b/plugins/base/src/test/kotlin/basic/DRITest.kt
@@ -1,8 +1,10 @@
 package basic
 
 import org.jetbrains.dokka.links.*
-import org.jetbrains.dokka.pages.ContentPage
-import org.jetbrains.dokka.pages.asSequence
+import org.jetbrains.dokka.model.DClass
+import org.jetbrains.dokka.model.DFunction
+import org.jetbrains.dokka.model.DParameter
+import org.jetbrains.dokka.pages.*
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest
 
@@ -131,7 +133,7 @@ class DRITest : AbstractCoreTest() {
             configuration
         ) {
             pagesGenerationStage = { module ->
-                // DRI(//qux/Foo[TypeParam(bounds=[kotlin.Comparable[kotlin.Any?]]),*]#//)
+                // DRI(//qux/Foo[TypeParam(bounds=[kotlin.Comparable[kotlin.Any?]]),*]#/PointingToFunctionOrClasslike/)
                 val expectedDRI = DRI(
                     "",
                     null,
@@ -163,4 +165,114 @@ class DRITest : AbstractCoreTest() {
             }
         }
     }
+
+    @Test
+    fun driForGenericClass(){
+        val configuration = dokkaConfiguration {
+            passes {
+                pass {
+                    sourceRoots = listOf("src/")
+                }
+            }
+        }
+        testInline(
+            """
+            |/src/main/kotlin/Test.kt
+            |package example
+            |
+            |class Sample<S>(first: S){ }
+            |
+            |
+        """.trimMargin(),
+            configuration
+        ) {
+            pagesGenerationStage = { module ->
+                val sampleClass = module.dfs { it.name == "Sample" } as ClasslikePageNode
+                val classDocumentable = sampleClass.documentable as DClass
+
+                assertEquals( "example/Sample///PointingToDeclaration/", sampleClass.dri.first().toString())
+                assertEquals("example/Sample///PointingToGenericParameters(0)/", classDocumentable.generics.first().dri.toString())
+            }
+        }
+    }
+
+    @Test
+    fun driForGenericFunction(){
+        val configuration = dokkaConfiguration {
+            passes {
+                pass {
+                    sourceRoots = listOf("src/")
+                    classpath = listOfNotNull(jvmStdlibPath)
+                }
+            }
+        }
+        testInline(
+            """
+            |/src/main/kotlin/Test.kt
+            |package example
+            |
+            |class Sample<S>(first: S){
+            |    fun <T> genericFun(param1: String): Triple<S,T> = TODO()
+            |}
+            |
+            |
+        """.trimMargin(),
+            configuration
+        ) {
+            pagesGenerationStage = { module ->
+                val sampleClass = module.dfs { it.name == "Sample" } as ClasslikePageNode
+                val functionNode = sampleClass.children.first { it.name == "genericFun" } as MemberPageNode
+                val functionDocumentable = functionNode.documentable as DFunction
+                val parameter = functionDocumentable.parameters.first()
+
+                assertEquals("example/Sample/genericFun/#kotlin.String/PointingToDeclaration/", functionNode.dri.first().toString())
+
+                assertEquals(1, functionDocumentable.parameters.size)
+                assertEquals("example/Sample/genericFun/#kotlin.String/PointingToCallableParameters(0)/", parameter.dri.toString())
+                //1 since from the function's perspective there is only 1 new generic declared
+                //The other one is 'inherited' from class
+                assertEquals( 1, functionDocumentable.generics.size)
+                assertEquals( "T", functionDocumentable.generics.first().name)
+                assertEquals( "example/Sample/genericFun/#kotlin.String/PointingToGenericParameters(0)/", functionDocumentable.generics.first().dri.toString())
+            }
+        }
+    }
+
+    @Test
+    fun driForGenericExtensionFunction(){
+        val configuration = dokkaConfiguration {
+            passes {
+                pass {
+                    sourceRoots = listOf("src/")
+                }
+            }
+        }
+        testInline(
+            """
+            |/src/main/kotlin/Test.kt
+            |package example
+            |
+            | fun <T> List<T>.extensionFunction(): String = ""
+            |
+        """.trimMargin(),
+            configuration
+        ) {
+            pagesGenerationStage = { module ->
+                val extensionFunction = module.dfs { it.name == "extensionFunction" } as MemberPageNode
+                val documentable = extensionFunction.documentable as DFunction
+
+                assertEquals(
+                    "example//extensionFunction/kotlin.collections.List[TypeParam(bounds=[kotlin.Any?])]#/PointingToDeclaration/",
+                    extensionFunction.dri.first().toString()
+                )
+                assertEquals(1, documentable.generics.size)
+                assertEquals("T", documentable.generics.first().name)
+                assertEquals(
+                    "example//extensionFunction/kotlin.collections.List[TypeParam(bounds=[kotlin.Any?])]#/PointingToGenericParameters(0)/",
+                     documentable.generics.first().dri.toString()
+                )
+
+            }
+        }
+    }
 }
diff --git a/plugins/base/src/test/kotlin/markdown/LinkTest.kt b/plugins/base/src/test/kotlin/markdown/LinkTest.kt
index d38486b5..bf234b6b 100644
--- a/plugins/base/src/test/kotlin/markdown/LinkTest.kt
+++ b/plugins/base/src/test/kotlin/markdown/LinkTest.kt
@@ -1,10 +1,12 @@
 package markdown
 
+import org.jetbrains.dokka.pages.ClasslikePageNode
 import org.jetbrains.dokka.pages.ContentDRILink
 import org.jetbrains.dokka.pages.MemberPageNode
 import org.jetbrains.dokka.pages.dfs
 import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Test
 
 class LinkTest : AbstractCoreTest() {
@@ -36,11 +38,43 @@ class LinkTest : AbstractCoreTest() {
                     .dfs { node -> node is ContentDRILink }
                     .let {
                         assertEquals(
-                            "parser//test/#java.lang.ClassLoader//",
+                            "parser//test/#java.lang.ClassLoader/PointingToDeclaration/",
                             (it as ContentDRILink).address.toString()
                         )
                     }
             }
         }
     }
+
+    @Test
+    fun returnTypeShouldHaveLinkToOuterClassFromInner() {
+        val configuration = dokkaConfiguration {
+            passes {
+                pass {
+                    sourceRoots = listOf("src/main/kotlin/parser")
+                }
+            }
+        }
+        testInline(
+            """
+            |/src/main/kotlin/parser/Test.kt
+            |package parser
+            |
+            |class Outer<OUTER> {
+            |   inner class Inner<INNER> {
+            |       fun foo(): OUTER = TODO()
+            |   }
+            |}
+        """.trimMargin(),
+            configuration
+        ) {
+            renderingStage = { rootPageNode, _ ->
+                val root = rootPageNode.children.single().children.single() as ClasslikePageNode
+                val innerClass = root.children.first { it is ClasslikePageNode }
+                val foo = innerClass.children.first { it.name == "foo" } as MemberPageNode
+
+                assertNotNull(foo.content.dfs { it is ContentDRILink && it.address.toString() == "parser/Outer///PointingToDeclaration/" } )
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/plugins/base/src/test/kotlin/model/ClassesTest.kt b/plugins/base/src/test/kotlin/model/ClassesTest.kt
index a349e54a..ea0d93ed 100644
--- a/plugins/base/src/test/kotlin/model/ClassesTest.kt
+++ b/plugins/base/src/test/kotlin/model/ClassesTest.kt
@@ -425,7 +425,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
         ) {
             with((this / "classes" / "Foo").cast<DClass>()) {
                 with(extra[Annotations]?.content?.firstOrNull().assertNotNull("annotations")) {
-                    dri.toString() equals "kotlin/Suppress////"
+                    dri.toString() equals "kotlin/Suppress///PointingToDeclaration/"
                     with(params["names"].assertNotNull("param")) {
                         this equals "[\"abc\"]"
                     }
@@ -459,4 +459,29 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             }
         }
     }
+
+    @Test fun genericAnnotationClass() {
+        inlineModelTest(
+            """annotation class Foo<A,B,C,D:Number>() {}"""
+        ) {
+            with((this / "classes" / "Foo").cast<DAnnotation>()){
+                generics.map { it.name to it.bounds.first().name } equals listOf("A" to "Any", "B" to "Any", "C" to "Any", "D" to "Number")
+            }
+        }
+    }
+
+    @Test fun nestedGenericClasses(){
+        inlineModelTest(
+            """
+            |class Outer<OUTER> {
+            |   inner class Inner<INNER, T : OUTER> { }
+            |}
+        """.trimMargin()
+        ){
+            with((this / "classes" / "Outer").cast<DClass>()){
+                val inner = classlikes.single().cast<DClass>()
+                inner.generics.map { it.name to it.bounds.first().name } equals listOf("INNER" to "Any", "T" to "OUTER")
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/plugins/base/src/test/kotlin/model/JavaTest.kt b/plugins/base/src/test/kotlin/model/JavaTest.kt
index a58b380c..76924f0f 100644
--- a/plugins/base/src/test/kotlin/model/JavaTest.kt
+++ b/plugins/base/src/test/kotlin/model/JavaTest.kt
@@ -394,7 +394,6 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
         }
     }
 
-    @Disabled("reenable after fixing subtypes")
     @Test
     fun inheritorLinks() {
         inlineModelTest(
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index 5a77016d..8d9ac20d 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -1,12 +1,13 @@
 package org.jetbrains.dokka.kotlinAsJava.converters
 
+import org.jetbrains.dokka.links.*
 import org.jetbrains.dokka.links.Callable
-import org.jetbrains.dokka.links.DRI
-import org.jetbrains.dokka.links.withClass
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.DAnnotation
 import org.jetbrains.dokka.model.DEnum
 import org.jetbrains.dokka.model.DFunction
+import org.jetbrains.dokka.model.Nullable
+import org.jetbrains.dokka.model.TypeConstructor
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
 import org.jetbrains.kotlin.name.ClassId
@@ -243,7 +244,7 @@ internal fun ClassId.toDRI(dri: DRI?): DRI = DRI(
     classNames = classNames(),
     callable = dri?.callable,//?.asJava(), TODO: check this
     extra = null,
-    target = null
+    target = PointingToDeclaration
 )
 
 private fun PropertyContainer<out Documentable>.mergeAdditionalModifiers(second: Set<ExtraModifiers>) =
diff --git a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
index d737cedb..9135d36e 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
@@ -92,7 +92,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
 
 
     private fun PageContentBuilder.DocumentableContentBuilder.signatureForProjection(p: Projection): Unit = when (p) {
-        is OtherParameter -> text(p.name)
+        is OtherParameter -> link(p.name, p.declarationDRI)
 
         is TypeConstructor -> group {
             link(p.dri.classNames.orEmpty(), p.dri)
-- 
cgit 


From 77fa898e8abdc8e74169fa789f2ba0e32d8fa9d7 Mon Sep 17 00:00:00 2001
From: Andrzej Ratajczak <andrzej.ratajczak98@gmail.com>
Date: Thu, 21 May 2020 11:29:22 +0200
Subject: Apply request changes

---
 core/src/main/kotlin/model/Documentable.kt         |  17 ---
 core/src/main/kotlin/model/aditionalExtras.kt      |  10 +-
 core/src/main/kotlin/model/extraModifiers.kt       |  60 ++++++++++
 .../main/kotlin/signatures/JvmSignatureUtils.kt    | 123 ++++++++++++++++++++
 .../main/kotlin/signatures/JvmSingatureUtils.kt    | 129 ---------------------
 .../kotlin/signatures/KotlinSignatureProvider.kt   |   5 +-
 .../main/kotlin/signatures/KotlinSignatureUtils.kt |   9 +-
 .../main/kotlin/signatures/SignatureProvider.kt    |   4 -
 .../DefaultDescriptorToDocumentableTranslator.kt   |  66 ++++++-----
 .../documentables/PageContentBuilder.kt            |   6 +-
 .../psi/DefaultPsiToDocumentableTranslator.kt      |  17 +--
 .../annotations/ContentForAnnotationsTest.kt       |   5 +-
 .../content/signatures/ContentForSignaturesTest.kt |  26 +++--
 plugins/base/src/test/kotlin/model/ClassesTest.kt  |  10 +-
 .../base/src/test/kotlin/model/FunctionsTest.kt    |  45 ++++---
 plugins/base/src/test/kotlin/model/JavaTest.kt     |  10 +-
 plugins/base/src/test/kotlin/model/PropertyTest.kt |   2 +-
 plugins/base/src/test/kotlin/utils/contentUtils.kt |  38 +++---
 .../kotlin/converters/KotlinToJavaConverter.kt     |  35 +++---
 .../kotlin/signatures/JavaSignatureProvider.kt     |   7 +-
 .../main/kotlin/signatures/JavaSignatureUtils.kt   |  11 +-
 21 files changed, 351 insertions(+), 284 deletions(-)
 create mode 100644 core/src/main/kotlin/model/extraModifiers.kt
 create mode 100644 plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt
 delete mode 100644 plugins/base/src/main/kotlin/signatures/JvmSingatureUtils.kt

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/core/src/main/kotlin/model/Documentable.kt b/core/src/main/kotlin/model/Documentable.kt
index b808e09c..a7dd0919 100644
--- a/core/src/main/kotlin/model/Documentable.kt
+++ b/core/src/main/kotlin/model/Documentable.kt
@@ -367,23 +367,6 @@ enum class FunctionModifiers {
     NONE, FUNCTION, EXTENSION
 }
 
-enum class ExtraModifiers {
-    STATIC, INLINE, INFIX, SUSPEND, REIFIED, CROSSINLINE, NOINLINE,
-    OVERRIDE, DATA, CONST, EXTERNAL, INNER, LATEINIT, OPERATOR, TAILREC, VARARG,
-    NATIVE, SYNCHRONIZED, STRICTFP, TRANSIENT, VOLATILE, TRANSITIVE;
-
-    companion object {
-        val kotlinOnlyModifiers = setOf(
-            INLINE, INFIX, EXTERNAL, SUSPEND, REIFIED, CROSSINLINE, NOINLINE, OVERRIDE, DATA, CONST, INNER, LATEINIT, OPERATOR,
-            TAILREC, VARARG
-        )
-
-        val javaOnlyModifiers = setOf(
-            STATIC, NATIVE, SYNCHRONIZED, STRICTFP, TRANSIENT, VOLATILE, TRANSITIVE
-        )
-    }
-}
-
 private fun String.shorten(maxLength: Int) = lineSequence().first().let {
     if (it.length != length || it.length > maxLength) it.take(maxLength - 3) + "..." else it
 }
diff --git a/core/src/main/kotlin/model/aditionalExtras.kt b/core/src/main/kotlin/model/aditionalExtras.kt
index 05b88f48..2b9d481f 100644
--- a/core/src/main/kotlin/model/aditionalExtras.kt
+++ b/core/src/main/kotlin/model/aditionalExtras.kt
@@ -39,11 +39,11 @@ class Annotations(val content: List<Annotation>) : ExtraProperty<Documentable> {
 }
 
 sealed class AnnotationParameterValue
-class AnnotationValue(val annotation: Annotations.Annotation) : AnnotationParameterValue()
-class ArrayValue(val value: List<AnnotationParameterValue>) : AnnotationParameterValue()
-class EnumValue(val enumName: String, val enumDri: DRI) : AnnotationParameterValue()
-class ClassValue(val className: String, val classDRI: DRI) : AnnotationParameterValue() // TODO Investigate if KtClassValue can be parameter of annotation
-class StringValue(val value: String) : 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> {
diff --git a/core/src/main/kotlin/model/extraModifiers.kt b/core/src/main/kotlin/model/extraModifiers.kt
new file mode 100644
index 00000000..093ce62a
--- /dev/null
+++ b/core/src/main/kotlin/model/extraModifiers.kt
@@ -0,0 +1,60 @@
+package org.jetbrains.dokka.model
+
+sealed class ExtraModifiers(val name: String) {
+
+    sealed class KotlinOnlyModifiers(name: String) : ExtraModifiers(name) {
+        object Inline : KotlinOnlyModifiers("inline")
+        object Infix : KotlinOnlyModifiers("infix")
+        object External : KotlinOnlyModifiers("external")
+        object Suspend : KotlinOnlyModifiers("suspend")
+        object Reified : KotlinOnlyModifiers("reified")
+        object CrossInline : KotlinOnlyModifiers("crossinline")
+        object NoInline : KotlinOnlyModifiers("noinline")
+        object Override : KotlinOnlyModifiers("override")
+        object Data : KotlinOnlyModifiers("data")
+        object Const : KotlinOnlyModifiers("const")
+        object Inner : KotlinOnlyModifiers("inner")
+        object LateInit : KotlinOnlyModifiers("lateinit")
+        object Operator : KotlinOnlyModifiers("operator")
+        object TailRec : KotlinOnlyModifiers("tailrec")
+        object VarArg : KotlinOnlyModifiers("vararg")
+    }
+
+    sealed class JavaOnlyModifiers(name: String) : ExtraModifiers(name) {
+        object Static : JavaOnlyModifiers("static")
+        object Native : JavaOnlyModifiers("native")
+        object Synchronized : JavaOnlyModifiers("synchronized")
+        object StrictFP : JavaOnlyModifiers("strictfp")
+        object Transient : JavaOnlyModifiers("transient")
+        object Volatile : JavaOnlyModifiers("volatile")
+        object Transitive : JavaOnlyModifiers("transitive")
+    }
+    
+    companion object {
+        fun valueOf(str: String) = when(str) {
+            "inline" -> KotlinOnlyModifiers.Inline
+            "infix" -> KotlinOnlyModifiers.Infix
+            "external" -> KotlinOnlyModifiers.External
+            "suspend" -> KotlinOnlyModifiers.Suspend
+            "reified" -> KotlinOnlyModifiers.Reified
+            "crossinline" -> KotlinOnlyModifiers.CrossInline
+            "noinline" -> KotlinOnlyModifiers.NoInline
+            "override" -> KotlinOnlyModifiers.Override
+            "data" -> KotlinOnlyModifiers.Data
+            "const" -> KotlinOnlyModifiers.Const
+            "inner" -> KotlinOnlyModifiers.Inner
+            "lateinit" -> KotlinOnlyModifiers.LateInit
+            "operator" -> KotlinOnlyModifiers.Operator
+            "tailrec" -> KotlinOnlyModifiers.TailRec
+            "vararg" -> KotlinOnlyModifiers.VarArg
+            "static" -> JavaOnlyModifiers.Static
+            "native" -> JavaOnlyModifiers.Native
+            "synchronized" -> JavaOnlyModifiers.Synchronized
+            "strictfp" -> JavaOnlyModifiers.StrictFP
+            "transient" -> JavaOnlyModifiers.Transient
+            "volatile" -> JavaOnlyModifiers.Volatile
+            "transitive" -> JavaOnlyModifiers.Transitive
+            else -> throw IllegalArgumentException("There is no Extra Modifier for given name $str")
+        }
+    }
+}
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt b/plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt
new file mode 100644
index 00000000..0ae72109
--- /dev/null
+++ b/plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt
@@ -0,0 +1,123 @@
+package org.jetbrains.dokka.base.signatures
+
+import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
+import org.jetbrains.dokka.model.*
+import org.jetbrains.dokka.model.properties.WithExtraProperties
+
+interface JvmSignatureUtils {
+
+    fun PageContentBuilder.DocumentableContentBuilder.annotationsBlock(d: Documentable)
+
+    fun PageContentBuilder.DocumentableContentBuilder.annotationsInline(d: Documentable)
+
+    fun <T : Documentable> WithExtraProperties<T>.modifiers(): Set<ExtraModifiers>
+
+    fun Set<ExtraModifiers>.toSignatureString(): String =
+        joinToString("") { it.name.toLowerCase() + " " }
+
+    fun <T : Documentable> WithExtraProperties<T>.annotations(): List<Annotations.Annotation> =
+        extra[Annotations]?.content ?: emptyList()
+
+    private fun Annotations.Annotation.toSignatureString(): String =
+        "@" + this.dri.classNames + "(" + this.params.entries.joinToString { it.key + "=" + it.value } + ")"
+
+    private fun PageContentBuilder.DocumentableContentBuilder.annotations(
+        d: Documentable,
+        ignored: Set<Annotations.Annotation>,
+        operation: (Annotations.Annotation) -> Unit
+    ): Unit = when (d) {
+        is DFunction -> d.annotations()
+        is DProperty -> d.annotations()
+        is DClass -> d.annotations()
+        is DInterface -> d.annotations()
+        is DObject -> d.annotations()
+        is DEnum -> d.annotations()
+        is DAnnotation -> d.annotations()
+        is DTypeParameter -> d.annotations()
+        is DEnumEntry -> d.annotations()
+        is DTypeAlias -> d.annotations()
+        is DParameter -> d.annotations()
+        else -> null
+    }?.let {
+        it.filter { it !in ignored }.forEach {
+            operation(it)
+        }
+    } ?: Unit
+
+    fun PageContentBuilder.DocumentableContentBuilder.toSignatureString(
+        a: Annotations.Annotation,
+        renderAtStrategy: AtStrategy,
+        listBrackets: Pair<Char, Char>,
+        classExtension: String
+    ) {
+        when (renderAtStrategy) {
+            is All, is OnlyOnce -> text("@")
+            is Never -> Unit
+        }
+        link(a.dri.classNames!!, a.dri)
+        text("(")
+        a.params.entries.forEachIndexed { i, it ->
+            text(it.key + " = ")
+            when (renderAtStrategy) {
+                is All -> All
+                is Never, is OnlyOnce -> Never
+            }.let { strategy ->
+                valueToSignature(it.value, strategy, listBrackets, classExtension)
+            }
+            if (i != a.params.entries.size - 1) text(", ")
+        }
+        text(")")
+    }
+
+    private fun PageContentBuilder.DocumentableContentBuilder.valueToSignature(
+        a: AnnotationParameterValue,
+        renderAtStrategy: AtStrategy,
+        listBrackets: Pair<Char, Char>,
+        classExtension: String
+    ): Unit = when (a) {
+        is AnnotationValue -> toSignatureString(a.annotation, renderAtStrategy, listBrackets, classExtension)
+        is ArrayValue -> {
+            text(listBrackets.first.toString())
+            a.value.forEachIndexed { i, it ->
+                valueToSignature(it, renderAtStrategy, listBrackets, classExtension)
+                if (i != a.value.size - 1) text(", ")
+            }
+            text(listBrackets.second.toString())
+        }
+        is EnumValue -> link(a.enumName, a.enumDri)
+        is ClassValue -> link(a.className + classExtension, a.classDRI)
+        is StringValue -> text(a.value)
+    }
+
+    fun PageContentBuilder.DocumentableContentBuilder.annotationsBlockWithIgnored(
+        d: Documentable,
+        ignored: Set<Annotations.Annotation>,
+        renderAtStrategy: AtStrategy,
+        listBrackets: Pair<Char, Char>,
+        classExtension: String
+    ) {
+        annotations(d, ignored) {
+            group {
+                toSignatureString(it, renderAtStrategy, listBrackets, classExtension)
+            }
+        }
+    }
+
+    fun PageContentBuilder.DocumentableContentBuilder.annotationsInlineWithIgnored(
+        d: Documentable,
+        ignored: Set<Annotations.Annotation>,
+        renderAtStrategy: AtStrategy,
+        listBrackets: Pair<Char, Char>,
+        classExtension: String
+    ) {
+        annotations(d, ignored) {
+            toSignatureString(it, renderAtStrategy, listBrackets, classExtension)
+            text(Typography.nbsp.toString())
+        }
+    }
+}
+
+sealed class AtStrategy
+object All : AtStrategy()
+object OnlyOnce : AtStrategy()
+object Never : AtStrategy()
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/signatures/JvmSingatureUtils.kt b/plugins/base/src/main/kotlin/signatures/JvmSingatureUtils.kt
deleted file mode 100644
index dde553b9..00000000
--- a/plugins/base/src/main/kotlin/signatures/JvmSingatureUtils.kt
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.jetbrains.dokka.base.signatures
-
-import javaslang.Tuple2
-import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
-import org.jetbrains.dokka.model.*
-import org.jetbrains.dokka.model.properties.WithExtraProperties
-
-interface JvmSingatureUtils {
-
-    fun PageContentBuilder.DocumentableContentBuilder.annotationsBlock(d: Documentable)
-
-    fun PageContentBuilder.DocumentableContentBuilder.annotationsInline(d: Documentable)
-
-    fun <T : Documentable> WithExtraProperties<T>.modifiers(): Set<ExtraModifiers>
-
-    fun Set<ExtraModifiers>.toSignatureString(): String =
-        joinToString("") { it.name.toLowerCase() + " " }
-
-    fun <T : Documentable> WithExtraProperties<T>.annotations(): List<Annotations.Annotation> =
-        extra[Annotations]?.content ?: emptyList()
-
-    private fun Annotations.Annotation.toSignatureString(): String =
-        "@${this.dri.classNames}(${this.params.entries.joinToString { it.key + "=" + it.value }})"
-
-    private fun PageContentBuilder.DocumentableContentBuilder.annotations(
-        d: Documentable,
-        ignored: Set<Annotations.Annotation>,
-        operation: (Annotations.Annotation) -> Unit
-    ): Unit = when (d) {
-        is DFunction -> d.annotations()
-        is DProperty -> d.annotations()
-        is DClass -> d.annotations()
-        is DInterface -> d.annotations()
-        is DObject -> d.annotations()
-        is DEnum -> d.annotations()
-        is DAnnotation -> d.annotations()
-        is DTypeParameter -> d.annotations()
-        is DEnumEntry -> d.annotations()
-        is DTypeAlias -> d.annotations()
-        is DParameter -> d.annotations()
-        else -> null
-    }?.let {
-        it.filter { it !in ignored }.forEach {
-            operation(it)
-        }
-    } ?: Unit
-
-    fun <T : Documentable> WithExtraProperties<T>.modifiersWithFilter(
-        filter: Set<ExtraModifiers> = ExtraModifiers.values().toSet()
-    ): Set<ExtraModifiers> =
-        extra[AdditionalModifiers]?.content?.filter { it in filter }?.toSet() ?: emptySet()
-
-    fun PageContentBuilder.DocumentableContentBuilder.toSignatureString(
-        a: Annotations.Annotation,
-        renderAtStrategy: AtStrategy,
-        listBrackets: Tuple2<Char, Char>,
-        classExtension: String
-    ) {
-        when (renderAtStrategy) {
-            is All, is OnlyOnce -> text("@")
-            is Never -> Unit
-        }
-        link(a.dri.classNames!!, a.dri)
-        text("(")
-        a.params.entries.forEachIndexed { i, it ->
-            text(it.key + " = ")
-            when (renderAtStrategy) {
-                is All -> All
-                is Never, is OnlyOnce -> Never
-            }.let { strategy ->
-                valueToSignature(it.value, strategy, listBrackets, classExtension)
-            }
-            if (i != a.params.entries.size - 1) text(", ")
-        }
-        text(")")
-    }
-
-    private fun PageContentBuilder.DocumentableContentBuilder.valueToSignature(
-        a: AnnotationParameterValue,
-        renderAtStrategy: AtStrategy,
-        listBrackets: Tuple2<Char, Char>,
-        classExtension: String
-    ): Unit = when (a) {
-        is AnnotationValue -> toSignatureString(a.annotation, renderAtStrategy, listBrackets, classExtension)
-        is ArrayValue -> {
-            text(listBrackets._1.toString())
-            a.value.forEachIndexed { i, it ->
-                valueToSignature(it, renderAtStrategy, listBrackets, classExtension)
-                if (i != a.value.size - 1) text(", ")
-            }
-            text(listBrackets._2.toString())
-        }
-        is EnumValue -> link(a.enumName, a.enumDri)
-        is ClassValue -> link(a.className + classExtension, a.classDRI)
-        is StringValue -> text(a.value)
-    }
-
-    fun PageContentBuilder.DocumentableContentBuilder.annotationsBlockWithIgnored(
-        d: Documentable,
-        ignored: Set<Annotations.Annotation>,
-        renderAtStrategy: AtStrategy,
-        listBrackets: Tuple2<Char, Char>,
-        classExtension: String
-    ) {
-        annotations(d, ignored) {
-            group {
-                toSignatureString(it, renderAtStrategy, listBrackets, classExtension)
-            }
-        }
-    }
-
-    fun PageContentBuilder.DocumentableContentBuilder.annotationsInlineWithIgnored(
-        d: Documentable,
-        ignored: Set<Annotations.Annotation>,
-        renderAtStrategy: AtStrategy,
-        listBrackets: Tuple2<Char, Char>,
-        classExtension: String
-    ) {
-        annotations(d, ignored) {
-            toSignatureString(it, renderAtStrategy, listBrackets, classExtension)
-            text(Typography.nbsp.toString())
-        }
-    }
-}
-
-sealed class AtStrategy
-object All : AtStrategy()
-object OnlyOnce : AtStrategy()
-object Never : AtStrategy()
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
index 4c689abc..33c82458 100644
--- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
+++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
@@ -6,7 +6,6 @@ import org.jetbrains.dokka.links.*
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.Nullable
 import org.jetbrains.dokka.model.TypeConstructor
-import org.jetbrains.dokka.model.properties.ExtraProperty
 import org.jetbrains.dokka.model.properties.WithExtraProperties
 import org.jetbrains.dokka.pages.ContentKind
 import org.jetbrains.dokka.pages.ContentNode
@@ -15,7 +14,7 @@ import org.jetbrains.dokka.utilities.DokkaLogger
 import kotlin.text.Typography.nbsp
 
 class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogger) : SignatureProvider,
-    JvmSingatureUtils by KotlinSignatureUtils {
+    JvmSignatureUtils by KotlinSignatureUtils {
     private val contentBuilder = PageContentBuilder(ctcc, this, logger)
 
     private val ignoredVisibilities = setOf(JavaVisibility.Public, KotlinVisibility.Public)
@@ -69,7 +68,7 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
                 if (c is DClass) {
                     platformText(c.modifier, sourceSets) {
                         if (it !in ignoredModifiers)
-                            if (c.extra[AdditionalModifiers]?.content?.contains(ExtraModifiers.DATA) == true) ""
+                            if (c.extra[AdditionalModifiers]?.content?.contains(ExtraModifiers.KotlinOnlyModifiers.Data) == true) ""
                             else (if (it is JavaModifier.Empty) KotlinModifier.Open else it).let { it.name + " " }
                         else
                             ""
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureUtils.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureUtils.kt
index 3ce4be0a..48cfe304 100644
--- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureUtils.kt
+++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureUtils.kt
@@ -1,16 +1,15 @@
 package org.jetbrains.dokka.base.signatures
 
-import javaslang.Tuple2
 import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
+import org.jetbrains.dokka.model.AdditionalModifiers
 import org.jetbrains.dokka.model.Documentable
 import org.jetbrains.dokka.model.ExtraModifiers
-import org.jetbrains.dokka.model.ExtraModifiers.Companion.kotlinOnlyModifiers
 import org.jetbrains.dokka.model.properties.WithExtraProperties
 
-object KotlinSignatureUtils : JvmSingatureUtils {
+object KotlinSignatureUtils : JvmSignatureUtils {
 
     private val strategy = OnlyOnce
-    private val listBrackets = Tuple2('[', ']')
+    private val listBrackets = Pair('[', ']')
     private val classExtension = "::class"
 
     override fun PageContentBuilder.DocumentableContentBuilder.annotationsBlock(d: Documentable) =
@@ -20,5 +19,5 @@ object KotlinSignatureUtils : JvmSingatureUtils {
         annotationsInlineWithIgnored(d, emptySet(), strategy, listBrackets, classExtension)
 
     override fun <T : Documentable> WithExtraProperties<T>.modifiers() =
-        modifiersWithFilter(kotlinOnlyModifiers)
+        extra[AdditionalModifiers]?.content?.filterIsInstance<ExtraModifiers.KotlinOnlyModifiers>()?.toSet() ?: emptySet()
 }
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/signatures/SignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/SignatureProvider.kt
index 7d7995b7..c04b6ecf 100644
--- a/plugins/base/src/main/kotlin/signatures/SignatureProvider.kt
+++ b/plugins/base/src/main/kotlin/signatures/SignatureProvider.kt
@@ -1,11 +1,7 @@
 package org.jetbrains.dokka.base.signatures
 
-import javaslang.Tuple2
-import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
 import org.jetbrains.dokka.model.*
-import org.jetbrains.dokka.model.properties.WithExtraProperties
 import org.jetbrains.dokka.pages.ContentNode
-import org.jetbrains.dokka.pages.TextStyle
 
 interface SignatureProvider {
     fun signature(documentable: Documentable): ContentNode
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index c24a3384..65b83200 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -46,7 +46,7 @@ import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.TypeProjection
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 import java.nio.file.Paths
-import java.lang.IllegalArgumentException
+import kotlin.IllegalArgumentException
 import kotlin.reflect.jvm.internal.impl.resolve.constants.KClassValue
 
 object DefaultDescriptorToDocumentableTranslator : SourceToDocumentableTranslator {
@@ -546,9 +546,7 @@ private class DokkaDescriptorVisitor(
             is TypeParameterDescriptor -> OtherParameter(
                 declarationDRI = DRI.from(ctor.containingDeclaration),
                 name = ctor.name.asString()
-            ).let {
-                if (isMarkedNullable) Nullable(it) else it
-            }
+            )
             else -> TypeConstructor(
                 DRI.from(constructor.declarationDescriptor!!), // TODO: remove '!!'
                 arguments.map { it.toProjection() },
@@ -556,6 +554,8 @@ private class DokkaDescriptorVisitor(
                 else if (isFunctionType) FunctionModifiers.FUNCTION
                 else FunctionModifiers.NONE
             )
+        }.let {
+            if (isMarkedNullable) Nullable(it) else it
         }
     }
 
@@ -593,43 +593,43 @@ private class DokkaDescriptorVisitor(
         DescriptorDocumentableSource(this).toSourceSetDependent()
 
     private fun FunctionDescriptor.additionalExtras() = listOfNotNull(
-        ExtraModifiers.INFIX.takeIf { isInfix },
-        ExtraModifiers.INLINE.takeIf { isInline },
-        ExtraModifiers.SUSPEND.takeIf { isSuspend },
-        ExtraModifiers.OPERATOR.takeIf { isOperator },
-        ExtraModifiers.STATIC.takeIf { isJvmStaticInObjectOrClassOrInterface() },
-        ExtraModifiers.TAILREC.takeIf { isTailrec },
-        ExtraModifiers.EXTERNAL.takeIf { isExternal },
-        ExtraModifiers.OVERRIDE.takeIf { DescriptorUtils.isOverride(this) }
+        ExtraModifiers.KotlinOnlyModifiers.Infix.takeIf { isInfix },
+        ExtraModifiers.KotlinOnlyModifiers.Inline.takeIf { isInline },
+        ExtraModifiers.KotlinOnlyModifiers.Suspend.takeIf { isSuspend },
+        ExtraModifiers.KotlinOnlyModifiers.Operator.takeIf { isOperator },
+        ExtraModifiers.JavaOnlyModifiers.Static.takeIf { isJvmStaticInObjectOrClassOrInterface() },
+        ExtraModifiers.KotlinOnlyModifiers.TailRec.takeIf { isTailrec },
+        ExtraModifiers.KotlinOnlyModifiers.External.takeIf { isExternal },
+        ExtraModifiers.KotlinOnlyModifiers.Override.takeIf { DescriptorUtils.isOverride(this) }
     ).toProperty()
 
     private fun ClassDescriptor.additionalExtras() = listOfNotNull(
-        ExtraModifiers.INLINE.takeIf { isInline },
-        ExtraModifiers.EXTERNAL.takeIf { isExternal },
-        ExtraModifiers.INNER.takeIf { isInner },
-        ExtraModifiers.DATA.takeIf { isData }
+        ExtraModifiers.KotlinOnlyModifiers.Inline.takeIf { isInline },
+        ExtraModifiers.KotlinOnlyModifiers.External.takeIf { isExternal },
+        ExtraModifiers.KotlinOnlyModifiers.Inner.takeIf { isInner },
+        ExtraModifiers.KotlinOnlyModifiers.Data.takeIf { isData }
     ).toProperty()
 
     private fun ValueParameterDescriptor.additionalExtras() =
         listOfNotNull(
-            ExtraModifiers.NOINLINE.takeIf { isNoinline },
-            ExtraModifiers.CROSSINLINE.takeIf { isCrossinline },
-            ExtraModifiers.CONST.takeIf { isConst },
-            ExtraModifiers.LATEINIT.takeIf { isLateInit },
-            ExtraModifiers.VARARG.takeIf { isVararg }
+            ExtraModifiers.KotlinOnlyModifiers.NoInline.takeIf { isNoinline },
+            ExtraModifiers.KotlinOnlyModifiers.CrossInline.takeIf { isCrossinline },
+            ExtraModifiers.KotlinOnlyModifiers.Const.takeIf { isConst },
+            ExtraModifiers.KotlinOnlyModifiers.LateInit.takeIf { isLateInit },
+            ExtraModifiers.KotlinOnlyModifiers.VarArg.takeIf { isVararg }
         ).toProperty()
 
     private fun TypeParameterDescriptor.additionalExtras() =
         listOfNotNull(
-            ExtraModifiers.REIFIED.takeIf { isReified }
+            ExtraModifiers.KotlinOnlyModifiers.Reified.takeIf { isReified }
         ).toProperty()
 
     private fun PropertyDescriptor.additionalExtras() = listOfNotNull(
-        ExtraModifiers.CONST.takeIf { isConst },
-        ExtraModifiers.LATEINIT.takeIf { isLateInit },
-        ExtraModifiers.STATIC.takeIf { isJvmStaticInObjectOrClassOrInterface() },
-        ExtraModifiers.EXTERNAL.takeIf { isExternal },
-        ExtraModifiers.OVERRIDE.takeIf { DescriptorUtils.isOverride(this) }
+        ExtraModifiers.KotlinOnlyModifiers.Const.takeIf { isConst },
+        ExtraModifiers.KotlinOnlyModifiers.LateInit.takeIf { isLateInit },
+        ExtraModifiers.JavaOnlyModifiers.Static.takeIf { isJvmStaticInObjectOrClassOrInterface() },
+        ExtraModifiers.KotlinOnlyModifiers.External.takeIf { isExternal },
+        ExtraModifiers.KotlinOnlyModifiers.Override.takeIf { DescriptorUtils.isOverride(this) }
     )
 
     private fun List<ExtraModifiers>.toProperty() =
@@ -640,11 +640,12 @@ private class DokkaDescriptorVisitor(
     private fun Annotated.getListOfAnnotations() = annotations.map { it.toAnnotation() }
 
     private fun ConstantValue<*>.toValue(): AnnotationParameterValue = when (this) {
-        is ConstantsAnnotationValue -> AnnotationValue(value.let { it.toAnnotation() })
+        is ConstantsAnnotationValue -> AnnotationValue(value.toAnnotation())
         is ConstantsArrayValue -> ArrayValue(value.map { it.toValue() })
         is ConstantsEnumValue -> EnumValue(
-            enumEntryName.identifier,
-            enumClassId.let { DRI(it.packageFqName.asString(), it.relativeClassName.asString()) })
+            fullEnumEntryName(),
+            DRI(enumClassId.packageFqName.asString(), fullEnumEntryName())
+        )
         is ConstantsKtClassValue -> when(value) {
             is NormalClass -> (value as NormalClass).value.classId.let {
                 ClassValue(
@@ -672,7 +673,7 @@ private class DokkaDescriptorVisitor(
 
     private fun FieldDescriptor.getAnnotationsAsExtraModifiers() = getAnnotations().content.mapNotNull {
         try {
-            ExtraModifiers.valueOf(it.dri.classNames?.toUpperCase() ?: "")
+            ExtraModifiers.valueOf(it.dri.classNames?.toLowerCase() ?: "")
         } catch (e: IllegalArgumentException) {
             null
         }
@@ -690,4 +691,7 @@ private class DokkaDescriptorVisitor(
         Visibilities.PRIVATE -> KotlinVisibility.Private
         else -> KotlinVisibility.Public
     }
+
+    private fun ConstantsEnumValue.fullEnumEntryName() =
+        "${this.enumClassId.relativeClassName.asString()}.${this.enumEntryName.identifier}"
 }
diff --git a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
index 658a86f2..5ff5a954 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
@@ -338,8 +338,10 @@ open class PageContentBuilder(
             value: SourceSetDependent<T>,
             platforms: Set<SourceSetData> = value.keys,
             transform: (T) -> String
-        ) = value.entries.filter { it.key in platforms }.forEach { (p, v) ->
-            transform(v).takeIf { it.isNotBlank() }?.also { text(it, sourceSets = setOf(p)) }
+        ) = value.entries.filter { it.key in platforms }.mapNotNull { (p, v) ->
+            transform(v).takeIf { it.isNotBlank() }?.let { it to p }
+        }.groupBy({ it.first }) { it.second }.forEach {
+            text(it.key, sourceSets = it.value.toSet())
         }
     }
 
diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
index 0f8fc011..9c731528 100644
--- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
@@ -1,5 +1,6 @@
 package org.jetbrains.dokka.base.translators.psi
 
+import com.intellij.icons.AllIcons.Nodes.Static
 import com.intellij.lang.jvm.annotation.JvmAnnotationAttribute
 import com.intellij.lang.jvm.JvmModifier
 import com.intellij.lang.jvm.types.JvmReferenceType
@@ -275,18 +276,18 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
 
         private fun PsiModifierListOwner.additionalExtras() = AdditionalModifiers(
             listOfNotNull(
-                ExtraModifiers.STATIC.takeIf { hasModifier(JvmModifier.STATIC) },
-                ExtraModifiers.NATIVE.takeIf { hasModifier(JvmModifier.NATIVE) },
-                ExtraModifiers.SYNCHRONIZED.takeIf { hasModifier(JvmModifier.SYNCHRONIZED) },
-                ExtraModifiers.STRICTFP.takeIf { hasModifier(JvmModifier.STRICTFP) },
-                ExtraModifiers.TRANSIENT.takeIf { hasModifier(JvmModifier.TRANSIENT) },
-                ExtraModifiers.VOLATILE.takeIf { hasModifier(JvmModifier.VOLATILE) },
-                ExtraModifiers.TRANSITIVE.takeIf { hasModifier(JvmModifier.TRANSITIVE) }
+                ExtraModifiers.JavaOnlyModifiers.Static.takeIf { hasModifier(JvmModifier.STATIC) },
+                ExtraModifiers.JavaOnlyModifiers.Native.takeIf { hasModifier(JvmModifier.NATIVE) },
+                ExtraModifiers.JavaOnlyModifiers.Synchronized.takeIf { hasModifier(JvmModifier.SYNCHRONIZED) },
+                ExtraModifiers.JavaOnlyModifiers.StrictFP.takeIf { hasModifier(JvmModifier.STRICTFP) },
+                ExtraModifiers.JavaOnlyModifiers.Transient.takeIf { hasModifier(JvmModifier.TRANSIENT) },
+                ExtraModifiers.JavaOnlyModifiers.Volatile.takeIf { hasModifier(JvmModifier.VOLATILE) },
+                ExtraModifiers.JavaOnlyModifiers.Transitive.takeIf { hasModifier(JvmModifier.TRANSITIVE) }
             ).toSet()
         )
 
         private fun AdditionalModifiers.toListOfAnnotations() = this.content.map {
-            if (it.name != "STATIC")
+            if (it !is ExtraModifiers.JavaOnlyModifiers.Static)
                 Annotations.Annotation(DRI("kotlin.jvm", it.name.toLowerCase().capitalize()), emptyMap())
             else
                 Annotations.Annotation(DRI("kotlin.jvm", "JvmStatic"), emptyMap())
diff --git a/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt b/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt
index c4640824..98f572b4 100644
--- a/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt
+++ b/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt
@@ -49,8 +49,9 @@ class ContentForAnnotationsTest : AbstractCoreTest() {
                 val page = module.children.single { it.name == "test" }
                     .children.single { it.name == "function" } as ContentPage
                 page.content.assertNode {
-
-                    header(1) { +"function" }
+                    group {
+                        header(1) { +"function" }
+                    }
                     divergentGroup {
                         divergentInstance {
                             divergent {
diff --git a/plugins/base/src/test/kotlin/content/signatures/ContentForSignaturesTest.kt b/plugins/base/src/test/kotlin/content/signatures/ContentForSignaturesTest.kt
index 3f0edec3..68042fd4 100644
--- a/plugins/base/src/test/kotlin/content/signatures/ContentForSignaturesTest.kt
+++ b/plugins/base/src/test/kotlin/content/signatures/ContentForSignaturesTest.kt
@@ -40,8 +40,9 @@ class ContentForSignaturesTest : AbstractCoreTest() {
                 val page = module.children.single { it.name == "test" }
                     .children.single { it.name == "function" } as ContentPage
                 page.content.assertNode {
-
-                    header(1) { +"function" }
+                    group {
+                        header(1) { +"function" }
+                    }
                     divergentGroup {
                         divergentInstance {
                             divergent {
@@ -78,7 +79,9 @@ class ContentForSignaturesTest : AbstractCoreTest() {
                 val page = module.children.single { it.name == "test" }
                     .children.single { it.name == "function" } as ContentPage
                 page.content.assertNode {
-                    header(1) { +"function" }
+                    group {
+                        header(1) { +"function" }
+                    }
                     divergentGroup {
                         divergentInstance {
                             divergent {
@@ -115,7 +118,9 @@ class ContentForSignaturesTest : AbstractCoreTest() {
                 val page = module.children.single { it.name == "test" }
                     .children.single { it.name == "function" } as ContentPage
                 page.content.assertNode {
-                    header(1) { +"function" }
+                    group {
+                        header(1) { +"function" }
+                    }
                     divergentGroup {
                         divergentInstance {
                             divergent {
@@ -152,8 +157,9 @@ class ContentForSignaturesTest : AbstractCoreTest() {
                 val page = module.children.single { it.name == "test" }
                     .children.single { it.name == "function" } as ContentPage
                 page.content.assertNode {
-
-                    header(1) { +"function" }
+                    group {
+                        header(1) { +"function" }
+                    }
                     divergentGroup {
                         divergentInstance {
                             divergent {
@@ -190,7 +196,9 @@ class ContentForSignaturesTest : AbstractCoreTest() {
                 val page = module.children.single { it.name == "test" }
                     .children.single { it.name == "function" } as ContentPage
                 page.content.assertNode {
-                    header(1) { +"function" }
+                    group {
+                        header(1) { +"function" }
+                    }
                     divergentGroup {
                         divergentInstance {
                             divergent {
@@ -227,7 +235,9 @@ class ContentForSignaturesTest : AbstractCoreTest() {
                 val page = module.children.single { it.name == "test" }
                     .children.single { it.name == "function" } as ContentPage
                 page.content.assertNode {
-                    header(1) { +"function" }
+                    group {
+                        header(1) { +"function" }
+                    }
                     divergentGroup {
                         divergentInstance {
                             divergent {
diff --git a/plugins/base/src/test/kotlin/model/ClassesTest.kt b/plugins/base/src/test/kotlin/model/ClassesTest.kt
index 405ec8b6..4ca34b00 100644
--- a/plugins/base/src/test/kotlin/model/ClassesTest.kt
+++ b/plugins/base/src/test/kotlin/model/ClassesTest.kt
@@ -152,7 +152,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
                 visibility.values allEquals KotlinVisibility.Public
                 with(extra[AdditionalModifiers].assertNotNull("Extras")) {
                     content counts 1
-                    content.first() equals ExtraModifiers.DATA
+                    content.first() equals ExtraModifiers.KotlinOnlyModifiers.Data
                 }
             }
         }
@@ -185,7 +185,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
                     with(content.first()) {
                         dri.classNames equals "Deprecated"
                         params.entries counts 1
-//                        params["message"].assertNotNull("message") equals "should no longer be used"
+                        (params["message"].assertNotNull("message") as StringValue).value equals "\"should no longer be used\""
                     }
                 }
             }
@@ -275,7 +275,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
                 with((this / "D").cast<DClass>()) {
                     with(extra[AdditionalModifiers].assertNotNull("AdditionalModifiers")) {
                         content counts 1
-                        content.first() equals ExtraModifiers.INNER
+                        content.first() equals ExtraModifiers.KotlinOnlyModifiers.Inner
                     }
                 }
             }
@@ -426,9 +426,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             with((this / "classes" / "Foo").cast<DClass>()) {
                 with(extra[Annotations]?.content?.firstOrNull().assertNotNull("annotations")) {
                     dri.toString() equals "kotlin/Suppress///PointingToDeclaration/"
-//                    with(params["names"].assertNotNull("param")) {
-//                        this equals "[\"abc\"]"
-//                    }
+                    (params["names"].assertNotNull("param") as ArrayValue).value equals listOf(StringValue("\"abc\""))
                 }
             }
         }
diff --git a/plugins/base/src/test/kotlin/model/FunctionsTest.kt b/plugins/base/src/test/kotlin/model/FunctionsTest.kt
index 6cbb84f7..38f64df5 100644
--- a/plugins/base/src/test/kotlin/model/FunctionsTest.kt
+++ b/plugins/base/src/test/kotlin/model/FunctionsTest.kt
@@ -1,5 +1,6 @@
 package model
 
+import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.model.*
 import org.junit.jupiter.api.Test
 import utils.AbstractModelTest
@@ -145,7 +146,7 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
                     with(content.first()) {
                         dri.classNames equals "Suppress"
                         params.entries counts 1
-//                        params["names"].assertNotNull("names") equals "[\"FOO\"]"
+                        (params["names"].assertNotNull("param") as ArrayValue).value equals listOf(StringValue("\"FOO\""))
                     }
                 }
             }
@@ -161,7 +162,7 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
         ) {
             with((this / "function" / "f").cast<DFunction>()) {
                 extra[AdditionalModifiers]?.content counts 1
-                extra[AdditionalModifiers]?.content exists ExtraModifiers.INLINE
+                extra[AdditionalModifiers]?.content exists ExtraModifiers.KotlinOnlyModifiers.Inline
             }
         }
     }
@@ -175,7 +176,7 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
         ) {
             with((this / "function" / "f").cast<DFunction>()) {
                 extra[AdditionalModifiers]?.content counts 1
-                extra[AdditionalModifiers]?.content exists ExtraModifiers.SUSPEND
+                extra[AdditionalModifiers]?.content exists ExtraModifiers.KotlinOnlyModifiers.Suspend
             }
         }
     }
@@ -189,8 +190,8 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
         ) {
             with((this / "function" / "f").cast<DFunction>()) {
                 extra[AdditionalModifiers]?.content counts 2
-                extra[AdditionalModifiers]?.content exists ExtraModifiers.SUSPEND
-                extra[AdditionalModifiers]?.content exists ExtraModifiers.INLINE
+                extra[AdditionalModifiers]?.content exists ExtraModifiers.KotlinOnlyModifiers.Suspend
+                extra[AdditionalModifiers]?.content exists ExtraModifiers.KotlinOnlyModifiers.Inline
             }
         }
     }
@@ -205,8 +206,8 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
             with((this / "function" / "f").cast<DFunction>()) {
                 with(extra[AdditionalModifiers].assertNotNull("AdditionalModifiers")) {
                     content counts 2
-                    content exists ExtraModifiers.SUSPEND
-                    content exists ExtraModifiers.INLINE
+                    content exists ExtraModifiers.KotlinOnlyModifiers.Suspend
+                    content exists ExtraModifiers.KotlinOnlyModifiers.Inline
                 }
             }
         }
@@ -229,10 +230,18 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
                     content counts 3
                     with(content.map { it.dri.classNames to it }.toMap()) {
                         with(this["Target"].assertNotNull("Target")) {
-//                            params["allowedTargets"].assertNotNull("allowedTargets") equals "[AnnotationTarget.VALUE_PARAMETER]"
+                            (params["allowedTargets"].assertNotNull("allowedTargets") as ArrayValue).value equals listOf(
+                                EnumValue(
+                                    "AnnotationTarget.VALUE_PARAMETER",
+                                    DRI("kotlin.annotation", "AnnotationTarget.VALUE_PARAMETER")
+                                )
+                            )
                         }
                         with(this["Retention"].assertNotNull("Retention")) {
-//                            params["value"].assertNotNull("value") equals "(kotlin/annotation/AnnotationRetention, SOURCE)"
+                            (params["value"].assertNotNull("value") as EnumValue) equals EnumValue(
+                                "AnnotationRetention.SOURCE",
+                                DRI("kotlin.annotation", "AnnotationRetention.SOURCE")
+                            )
                         }
                         this["MustBeDocumented"].assertNotNull("MustBeDocumented").params.entries counts 0
                     }
@@ -260,7 +269,7 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
         ) {
             with((this / "function" / "f" / "notInlined").cast<DParameter>()) {
                 extra[AdditionalModifiers]?.content counts 1
-                extra[AdditionalModifiers]?.content exists ExtraModifiers.NOINLINE
+                extra[AdditionalModifiers]?.content exists ExtraModifiers.KotlinOnlyModifiers.NoInline
             }
         }
     }
@@ -291,10 +300,18 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
                     content counts 3
                     with(content.map { it.dri.classNames to it }.toMap()) {
                         with(this["Target"].assertNotNull("Target")) {
-//                            params["allowedTargets"].assertNotNull("allowedTargets") equals "[AnnotationTarget.VALUE_PARAMETER]"
+                            (params["allowedTargets"].assertNotNull("allowedTargets") as ArrayValue).value equals listOf(
+                                EnumValue(
+                                    "AnnotationTarget.VALUE_PARAMETER",
+                                    DRI("kotlin.annotation", "AnnotationTarget.VALUE_PARAMETER")
+                                )
+                            )
                         }
                         with(this["Retention"].assertNotNull("Retention")) {
-//                            params["value"].assertNotNull("value") equals "(kotlin/annotation/AnnotationRetention, SOURCE)"
+                            (params["value"].assertNotNull("value") as EnumValue) equals EnumValue(
+                                "AnnotationRetention.SOURCE",
+                                DRI("kotlin.annotation", "AnnotationRetention.SOURCE")
+                            )
                         }
                         this["MustBeDocumented"].assertNotNull("MustBeDocumented").params.entries counts 0
                     }
@@ -307,7 +324,7 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
                     with(content.first()) {
                         dri.classNames equals "Fancy"
                         params.entries counts 1
-//                        params["size"] equals "1"
+                        (params["size"] as StringValue).value equals "1"
                     }
                 }
             }
@@ -369,7 +386,7 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
                     with(content.first()) {
                         dri.classNames equals "SinceKotlin"
                         params.entries counts 1
-//                        params["version"].assertNotNull("version") equals "1.1"
+                        (params["version"].assertNotNull("version") as StringValue).value equals "\"1.1\""
                     }
                 }
             }
diff --git a/plugins/base/src/test/kotlin/model/JavaTest.kt b/plugins/base/src/test/kotlin/model/JavaTest.kt
index 07af7913..fd293b5c 100644
--- a/plugins/base/src/test/kotlin/model/JavaTest.kt
+++ b/plugins/base/src/test/kotlin/model/JavaTest.kt
@@ -1,9 +1,9 @@
 package model
 
 import org.jetbrains.dokka.base.transformers.documentables.InheritorsInfo
+import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.model.*
 import org.junit.jupiter.api.Assertions.assertTrue
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import utils.AbstractModelTest
 import utils.assertNotNull
@@ -297,7 +297,7 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             with((this / "java" / "C" / "foo").cast<DFunction>()) {
                 with(extra[AdditionalModifiers].assertNotNull("AdditionalModifiers")) {
                     content counts 1
-                    content.first() equals ExtraModifiers.STATIC
+                    content.first() equals ExtraModifiers.JavaOnlyModifiers.Static
                 }
             }
         }
@@ -338,7 +338,11 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
                 with(extra[Annotations].assertNotNull("Annotations")) {
                     with(content.single()) {
                         dri.classNames equals "Target"
-//                        params["value"].assertNotNull("value") equals "{ElementType.FIELD, ElementType.TYPE, ElementType.METHOD}"
+                        (params["value"].assertNotNull("value") as ArrayValue).value equals listOf(
+                            EnumValue("ElementType.FIELD", DRI("java.lang.annotation", "ElementType")),
+                            EnumValue("ElementType.TYPE", DRI("java.lang.annotation", "ElementType")),
+                            EnumValue("ElementType.METHOD", DRI("java.lang.annotation", "ElementType"))
+                        )
                     }
                 }
             }
diff --git a/plugins/base/src/test/kotlin/model/PropertyTest.kt b/plugins/base/src/test/kotlin/model/PropertyTest.kt
index 7429257b..90a9d782 100644
--- a/plugins/base/src/test/kotlin/model/PropertyTest.kt
+++ b/plugins/base/src/test/kotlin/model/PropertyTest.kt
@@ -155,7 +155,7 @@ class PropertyTest : AbstractModelTest("/src/main/kotlin/property/Test.kt", "pro
                     with(content.first()) {
                         dri.classNames equals "SinceKotlin"
                         params.entries counts 1
-//                        params["version"].assertNotNull("version") equals "1.1"
+                        (params["version"].assertNotNull("version") as StringValue).value equals "\"1.1\""
                     }
                 }
             }
diff --git a/plugins/base/src/test/kotlin/utils/contentUtils.kt b/plugins/base/src/test/kotlin/utils/contentUtils.kt
index a1141832..ec119ebb 100644
--- a/plugins/base/src/test/kotlin/utils/contentUtils.kt
+++ b/plugins/base/src/test/kotlin/utils/contentUtils.kt
@@ -139,26 +139,28 @@ fun ContentMatcherBuilder<*>.propertySignature(
         header { +"Package test" }
     }
     group {
-        skipAllNotMatching()
-        header { +"Properties" }
-        table {
-            group {
-                link { +name }
-                platformHinted {
-                    group {
+        group {
+            skipAllNotMatching()
+            header { +"Properties" }
+            table {
+                group {
+                    link { +name }
+                    platformHinted {
                         group {
-                            annotations.entries.forEach {
-                                group {
-                                    unwrapAnnotation(it)
+                            group {
+                                annotations.entries.forEach {
+                                    group {
+                                        unwrapAnnotation(it)
+                                    }
                                 }
-                            }
-                            +("$visibility $modifier ${keywords.joinToString("") { "$it " }} $preposition")
-                            link { +name }
-                            if (type != null) {
-                                +(": ")
-                                group {
-                                    link {
-                                        +(type)
+                                +("$visibility $modifier ${keywords.joinToString("") { "$it " }} $preposition")
+                                link { +name }
+                                if (type != null) {
+                                    +(": ")
+                                    group {
+                                        link {
+                                            +(type)
+                                        }
                                     }
                                 }
                             }
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index 8d9ac20d..8f20f942 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -47,7 +47,7 @@ internal fun DPackage.asJava(): DPackage {
                 generics = emptyList(),
                 supertypes = emptyMap(),
                 documentation = emptyMap(),
-                modifier = sourceSets.map{ it to JavaModifier.Final}.toMap(),
+                modifier = sourceSets.map { it to JavaModifier.Final }.toMap(),
                 sourceSets = sourceSets,
                 extra = PropertyContainer.empty()
             )
@@ -68,15 +68,15 @@ internal fun DProperty.asJava(isTopLevel: Boolean = false, relocateToClass: Stri
             dri.withClass(relocateToClass)
         },
         modifier = if (setter == null) {
-            sourceSets.map{it to JavaModifier.Final}.toMap()
+            sourceSets.map { it to JavaModifier.Final }.toMap()
         } else {
-            sourceSets.map{it to JavaModifier.Empty}.toMap()
+            sourceSets.map { it to JavaModifier.Empty }.toMap()
         },
         visibility = visibility.mapValues { JavaVisibility.Private },
         type = type.asJava(), // TODO: check
         setter = null,
         getter = null, // Removing getters and setters as they will be available as functions
-        extra = if (isTopLevel) extra.plus(extra.mergeAdditionalModifiers(setOf(ExtraModifiers.STATIC))) else extra
+        extra = if (isTopLevel) extra.plus(extra.mergeAdditionalModifiers(setOf(ExtraModifiers.JavaOnlyModifiers.Static))) else extra
     )
 
 internal fun DProperty.javaAccessors(isTopLevel: Boolean = false, relocateToClass: String? = null): List<DFunction> =
@@ -89,13 +89,13 @@ internal fun DProperty.javaAccessors(isTopLevel: Boolean = false, relocateToClas
             },
             name = "get" + name.capitalize(),
             modifier = if (setter == null) {
-                sourceSets.map{it to JavaModifier.Final}.toMap()
+                sourceSets.map { it to JavaModifier.Final }.toMap()
             } else {
-                sourceSets.map{it to JavaModifier.Empty}.toMap()
+                sourceSets.map { it to JavaModifier.Empty }.toMap()
             },
             visibility = visibility.mapValues { JavaVisibility.Public },
             type = type.asJava(), // TODO: check
-            extra = if (isTopLevel) getter!!.extra.plus(getter!!.extra.mergeAdditionalModifiers(setOf(ExtraModifiers.STATIC))) else getter!!.extra
+            extra = if (isTopLevel) getter!!.extra.plus(getter!!.extra.mergeAdditionalModifiers(setOf(ExtraModifiers.JavaOnlyModifiers.Static))) else getter!!.extra
         ),
         setter?.copy(
             dri = if (relocateToClass.isNullOrBlank()) {
@@ -105,13 +105,13 @@ internal fun DProperty.javaAccessors(isTopLevel: Boolean = false, relocateToClas
             },
             name = "set" + name.capitalize(),
             modifier = if (setter == null) {
-                sourceSets.map{it to JavaModifier.Final}.toMap()
+                sourceSets.map { it to JavaModifier.Final }.toMap()
             } else {
-                sourceSets.map{it to JavaModifier.Empty}.toMap()
+                sourceSets.map { it to JavaModifier.Empty }.toMap()
             },
             visibility = visibility.mapValues { JavaVisibility.Public },
             type = type.asJava(), // TODO: check
-            extra = if (isTopLevel) setter!!.extra.plus(setter!!.extra.mergeAdditionalModifiers(setOf(ExtraModifiers.STATIC))) else setter!!.extra
+            extra = if (isTopLevel) setter!!.extra.plus(setter!!.extra.mergeAdditionalModifiers(setOf(ExtraModifiers.JavaOnlyModifiers.Static))) else setter!!.extra
         )
     )
 
@@ -125,9 +125,9 @@ internal fun DFunction.asJava(containingClassName: String): DFunction {
 //        dri = dri.copy(callable = dri.callable?.asJava()),
         name = newName,
         type = type.asJava(),
-        modifier = if(modifier.all{(_,v)-> v is KotlinModifier.Final} && isConstructor)
-            sourceSets.map{it to JavaModifier.Empty}.toMap()
-        else sourceSets.map{it to modifier.values.first()}.toMap(),
+        modifier = if (modifier.all { (_, v) -> v is KotlinModifier.Final } && isConstructor)
+            sourceSets.map { it to JavaModifier.Empty }.toMap()
+        else sourceSets.map { it to modifier.values.first() }.toMap(),
         parameters = listOfNotNull(receiver?.asJava()) + parameters.map { it.asJava() },
         receiver = null
     ) // TODO static if toplevel
@@ -151,8 +151,9 @@ internal fun DClass.asJava(): DClass = copy(
     classlikes = classlikes.map { it.asJava() },
     generics = generics.map { it.asJava() },
     supertypes = supertypes.mapValues { it.value.map { it.possiblyAsJava() } },
-    modifier = if (modifier.all{(_,v) -> v is KotlinModifier.Empty}) sourceSets.map{it to JavaModifier.Final}.toMap()
-    else sourceSets.map{it to modifier.values.first()}.toMap()
+    modifier = if (modifier.all { (_, v) -> v is KotlinModifier.Empty }) sourceSets.map { it to JavaModifier.Final }
+        .toMap()
+    else sourceSets.map { it to modifier.values.first() }.toMap()
 )
 
 private fun DTypeParameter.asJava(): DTypeParameter = copy(
@@ -188,7 +189,7 @@ internal fun DObject.asJava(): DObject = copy(
     properties = properties.map { it.asJava() } +
             DProperty(
                 name = "INSTANCE",
-                modifier = sourceSets.map{it to JavaModifier.Final}.toMap(),
+                modifier = sourceSets.map { it to JavaModifier.Final }.toMap(),
                 dri = dri.copy(callable = Callable("INSTANCE", null, emptyList())),
                 documentation = emptyMap(),
                 sources = emptyMap(),
@@ -202,7 +203,7 @@ internal fun DObject.asJava(): DObject = copy(
                 receiver = null,
                 generics = emptyList(),
                 expectPresentInSet = expectPresentInSet,
-                extra = PropertyContainer.empty<DProperty>() + AdditionalModifiers(setOf(ExtraModifiers.STATIC))
+                extra = PropertyContainer.empty<DProperty>() + AdditionalModifiers(setOf(ExtraModifiers.JavaOnlyModifiers.Static))
             ),
     classlikes = classlikes.map { it.asJava() },
     supertypes = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
diff --git a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
index ec3221e2..a55f9339 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
@@ -1,15 +1,12 @@
 package org.jetbrains.dokka.kotlinAsJava.signatures
 
-import org.jetbrains.dokka.base.signatures.JvmSingatureUtils
-import javaslang.Tuple2
-import org.jetbrains.dokka.base.signatures.All
+import org.jetbrains.dokka.base.signatures.JvmSignatureUtils
 import org.jetbrains.dokka.base.signatures.SignatureProvider
 import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
 import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.links.sureClassNames
 import org.jetbrains.dokka.model.*
-import org.jetbrains.dokka.model.properties.WithExtraProperties
 import org.jetbrains.dokka.pages.ContentKind
 import org.jetbrains.dokka.pages.ContentNode
 import org.jetbrains.dokka.pages.TextStyle
@@ -17,7 +14,7 @@ import org.jetbrains.dokka.utilities.DokkaLogger
 import kotlin.text.Typography.nbsp
 
 class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogger) : SignatureProvider,
-    JvmSingatureUtils by JavaSignatureUtils {
+    JvmSignatureUtils by JavaSignatureUtils {
     private val contentBuilder = PageContentBuilder(ctcc, this, logger)
 
     private val ignoredVisibilities = setOf(JavaVisibility.Default)
diff --git a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureUtils.kt b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureUtils.kt
index 16c3f25a..e2f73bf9 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureUtils.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureUtils.kt
@@ -1,14 +1,13 @@
 package org.jetbrains.dokka.kotlinAsJava.signatures
-import javaslang.Tuple2
+
 import org.jetbrains.dokka.base.signatures.All
-import org.jetbrains.dokka.base.signatures.JvmSingatureUtils
+import org.jetbrains.dokka.base.signatures.JvmSignatureUtils
 import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.model.*
-import org.jetbrains.dokka.model.ExtraModifiers.Companion.javaOnlyModifiers
 import org.jetbrains.dokka.model.properties.WithExtraProperties
 
-object JavaSignatureUtils : JvmSingatureUtils {
+object JavaSignatureUtils : JvmSignatureUtils {
 
     val ignoredAnnotations = setOf(
         Annotations.Annotation(DRI("kotlin.jvm", "Transient"), emptyMap()),
@@ -19,7 +18,7 @@ object JavaSignatureUtils : JvmSingatureUtils {
     )
 
     private val strategy = All
-    private val listBrackets = Tuple2('{', '}')
+    private val listBrackets = Pair('{', '}')
     private val classExtension = ".class"
 
     override fun PageContentBuilder.DocumentableContentBuilder.annotationsBlock(d: Documentable) =
@@ -29,6 +28,6 @@ object JavaSignatureUtils : JvmSingatureUtils {
         annotationsInlineWithIgnored(d, ignoredAnnotations, strategy, listBrackets, classExtension)
 
     override fun <T : Documentable> WithExtraProperties<T>.modifiers() =
-        modifiersWithFilter(javaOnlyModifiers)
+        extra[AdditionalModifiers]?.content?.filterIsInstance<ExtraModifiers.JavaOnlyModifiers>()?.toSet() ?: emptySet()
 
 }
\ No newline at end of file
-- 
cgit 


From dd44b839eac1b7b647e97f2cc73dd96bd054713b Mon Sep 17 00:00:00 2001
From: Andrzej Ratajczak <andrzej.ratajczak98@gmail.com>
Date: Thu, 28 May 2020 21:12:50 +0200
Subject: Refactor of Annotations and ExtraModifiers to be platform depedent

---
 core/src/main/kotlin/model/aditionalExtras.kt      |   6 +-
 .../main/kotlin/signatures/JvmSignatureUtils.kt    |  27 ++--
 .../kotlin/signatures/KotlinSignatureProvider.kt   | 162 ++++++++++-----------
 .../main/kotlin/signatures/KotlinSignatureUtils.kt |   4 +-
 .../DefaultDescriptorToDocumentableTranslator.kt   | 154 +++++++++++---------
 .../psi/DefaultPsiToDocumentableTranslator.kt      | 117 ++++++++-------
 .../annotations/ContentForAnnotationsTest.kt       |   2 -
 plugins/base/src/test/kotlin/model/ClassesTest.kt  |  38 ++---
 .../base/src/test/kotlin/model/FunctionsTest.kt    |  62 ++++----
 plugins/base/src/test/kotlin/model/JavaTest.kt     |  10 +-
 plugins/base/src/test/kotlin/model/PropertyTest.kt |  12 +-
 plugins/base/src/test/kotlin/utils/contentUtils.kt | 154 ++++++++++----------
 .../kotlin/converters/KotlinToJavaConverter.kt     |  29 +++-
 .../kotlin/signatures/JavaSignatureProvider.kt     |   8 +-
 .../main/kotlin/signatures/JavaSignatureUtils.kt   |   4 +-
 15 files changed, 416 insertions(+), 373 deletions(-)

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/core/src/main/kotlin/model/aditionalExtras.kt b/core/src/main/kotlin/model/aditionalExtras.kt
index fcf1efa6..b4355d4b 100644
--- a/core/src/main/kotlin/model/aditionalExtras.kt
+++ b/core/src/main/kotlin/model/aditionalExtras.kt
@@ -4,7 +4,7 @@ import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.model.properties.ExtraProperty
 import org.jetbrains.dokka.model.properties.MergeStrategy
 
-class AdditionalModifiers(val content: Set<ExtraModifiers>) : ExtraProperty<Documentable> {
+class AdditionalModifiers(val content: SourceSetDependent<Set<ExtraModifiers>>) : ExtraProperty<Documentable> {
     companion object : ExtraProperty.Key<Documentable, AdditionalModifiers> {
         override fun mergeStrategyFor(
             left: AdditionalModifiers,
@@ -19,6 +19,8 @@ class AdditionalModifiers(val content: Set<ExtraModifiers>) : ExtraProperty<Docu
     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> =
@@ -37,6 +39,8 @@ class Annotations(val content: SourceSetDependent<List<Annotation>>) : ExtraProp
     }
 }
 
+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()
diff --git a/plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt b/plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt
index 0cf085b8..7f0e985e 100644
--- a/plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt
+++ b/plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt
@@ -3,6 +3,7 @@ package org.jetbrains.dokka.base.signatures
 import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.properties.WithExtraProperties
+import org.jetbrains.dokka.pages.*
 
 interface JvmSignatureUtils {
 
@@ -10,7 +11,7 @@ interface JvmSignatureUtils {
 
     fun PageContentBuilder.DocumentableContentBuilder.annotationsInline(d: Documentable)
 
-    fun <T : Documentable> WithExtraProperties<T>.modifiers(): Set<ExtraModifiers>
+    fun <T : Documentable> WithExtraProperties<T>.modifiers(): SourceSetDependent<Set<ExtraModifiers>>
 
     fun Set<ExtraModifiers>.toSignatureString(): String =
         joinToString("") { it.name.toLowerCase() + " " }
@@ -40,9 +41,11 @@ interface JvmSignatureUtils {
         else -> null
     }?.let {
         it.entries.forEach {
-            group(sourceSets = setOf(it.key)) {
-                it.value.filter { it !in ignored }.forEach {
-                    operation(it)
+            it.value.filter { it !in ignored }.takeIf { it.isNotEmpty() }?.let { annotations ->
+                group(sourceSets = setOf(it.key), styles = setOf(TextStyle.Block)) {
+                    annotations.forEach {
+                        operation(it)
+                    }
                 }
             }
         }
@@ -62,14 +65,16 @@ interface JvmSignatureUtils {
         link(a.dri.classNames!!, a.dri)
         text("(")
         a.params.entries.forEachIndexed { i, it ->
-            text(it.key + " = ")
-            when (renderAtStrategy) {
-                is All -> All
-                is Never, is OnlyOnce -> Never
-            }.let { strategy ->
-                valueToSignature(it.value, strategy, listBrackets, classExtension)
+            group(styles = setOf(TextStyle.Span)) {
+                text(it.key + " = ")
+                when (renderAtStrategy) {
+                    is All -> All
+                    is Never, is OnlyOnce -> Never
+                }.let { strategy ->
+                    valueToSignature(it.value, strategy, listBrackets, classExtension)
+                }
+                if (i != a.params.entries.size - 1) text(", ")
             }
-            if (i != a.params.entries.size - 1) text(", ")
         }
         text(")")
     }
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
index 5514f9e5..542f6a1a 100644
--- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
+++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
@@ -67,34 +67,34 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
 
     private fun regularSignature(c: DClasslike, sourceSets: Set<SourceSetData> = c.sourceSets.toSet()) =
         contentBuilder.contentFor(c, ContentKind.Symbol, setOf(TextStyle.Monospace), sourceSets = sourceSets) {
-            group(styles = setOf(TextStyle.Block)) {
-                annotationsBlock(c)
-                platformText(
-                    c.visibility,
-                    sourceSets
-                ) { it.takeIf { it !in ignoredVisibilities }?.name?.let { "$it " } ?: "" }
-                if (c is DClass) {
-                    platformText(c.modifier, sourceSets) {
-                        if (it !in ignoredModifiers)
-                            if (c.extra[AdditionalModifiers]?.content?.contains(ExtraModifiers.KotlinOnlyModifiers.Data) == true) ""
-                            else (if (it is JavaModifier.Empty) KotlinModifier.Open else it).let { it.name + " " }
-                        else
-                            ""
-                    }
-                }
-                when (c) {
-                    is DClass -> text("class ")
-                    is DInterface -> text("interface ")
-                    is DEnum -> text("enum ")
-                    is DObject -> text("object ")
-                    is DAnnotation -> text("annotation class ")
+            annotationsBlock(c)
+            platformText(
+                c.visibility,
+                sourceSets
+            ) { it.takeIf { it !in ignoredVisibilities }?.name?.let { "$it " } ?: "" }
+            if (c is DClass) {
+                platformText(c.modifier, sourceSets) {
+                    if (it !in ignoredModifiers)
+                        if (c.extra[AdditionalModifiers]?.content?.contains(ExtraModifiers.KotlinOnlyModifiers.Data) == true) ""
+                        else (if (it is JavaModifier.Empty) KotlinModifier.Open else it).let { it.name + " " }
+                    else
+                        ""
                 }
-                link(c.name!!, c.dri)
-                if (c is WithGenerics) {
-                    list(c.generics, prefix = "<", suffix = "> ") {
-                        +buildSignature(it)
-                    }
+            }
+            when (c) {
+                is DClass -> text("class ")
+                is DInterface -> text("interface ")
+                is DEnum -> text("enum ")
+                is DObject -> text("object ")
+                is DAnnotation -> text("annotation class ")
+            }
+            link(c.name!!, c.dri)
+            if (c is WithGenerics) {
+                list(c.generics, prefix = "<", suffix = "> ") {
+                    +buildSignature(it)
                 }
+            }
+            if (c is DClass) {
                 if (c is WithConstructors) {
                     val pConstructor = c.constructors.singleOrNull { it.extra[PrimaryConstructorExtra] != null }
                     if (pConstructor?.annotations()?.isNotEmpty() == true) {
@@ -115,11 +115,11 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
                         signatureForProjection(it.type)
                     }
                 }
-                if (c is WithSupertypes) {
-                    c.supertypes.filter { it.key in sourceSets }.map { (s, dris) ->
-                        list(dris, prefix = " : ", sourceSets = setOf(s)) {
-                            link(it.sureClassNames, it, sourceSets = setOf(s))
-                        }
+            }
+            if (c is WithSupertypes) {
+                c.supertypes.filter { it.key in sourceSets }.map { (s, dris) ->
+                    list(dris, prefix = " : ", sourceSets = setOf(s)) {
+                        link(it.sureClassNames, it, sourceSets = setOf(s))
                     }
                 }
             }
@@ -128,62 +128,58 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
 
     private fun propertySignature(p: DProperty, sourceSets: Set<SourceSetData> = p.sourceSets.toSet()) =
         contentBuilder.contentFor(p, ContentKind.Symbol, setOf(TextStyle.Monospace), sourceSets = sourceSets) {
-            group(styles = setOf(TextStyle.Block)) {
-                annotationsBlock(p)
-                platformText(p.visibility) { it.takeIf { it !in ignoredVisibilities }?.name?.let { "$it " } ?: "" }
-                platformText(p.modifier) {
-                    it.takeIf { it !in ignoredModifiers }?.let {
-                        if (it is JavaModifier.Empty) KotlinModifier.Open else it
-                    }?.name?.let { "$it " } ?: ""
-                }
-                text(p.modifiers().toSignatureString())
-                p.setter?.let { text("var ") } ?: text("val ")
-                list(p.generics, prefix = "<", suffix = "> ") {
-                    +buildSignature(it)
-                }
-                p.receiver?.also {
-                    signatureForProjection(it.type)
-                    text(".")
-                }
-                link(p.name, p.dri)
-                text(": ")
-                signatureForProjection(p.type)
+            annotationsBlock(p)
+            platformText(p.visibility) { it.takeIf { it !in ignoredVisibilities }?.name?.let { "$it " } ?: "" }
+            platformText(p.modifier) {
+                it.takeIf { it !in ignoredModifiers }?.let {
+                    if (it is JavaModifier.Empty) KotlinModifier.Open else it
+                }?.name?.let { "$it " } ?: ""
+            }
+            platformText(p.modifiers()) { it.toSignatureString() }
+            p.setter?.let { text("var ") } ?: text("val ")
+            list(p.generics, prefix = "<", suffix = "> ") {
+                +buildSignature(it)
+            }
+            p.receiver?.also {
+                signatureForProjection(it.type)
+                text(".")
             }
+            link(p.name, p.dri)
+            text(": ")
+            signatureForProjection(p.type)
         }
 
     private fun functionSignature(f: DFunction, sourceSets: Set<SourceSetData> = f.sourceSets.toSet()) =
         contentBuilder.contentFor(f, ContentKind.Symbol, setOf(TextStyle.Monospace), sourceSets = sourceSets) {
-            group(styles = setOf(TextStyle.Block)) {
-                annotationsBlock(f)
-                platformText(f.visibility) { it.takeIf { it !in ignoredVisibilities }?.name?.let { "$it " } ?: "" }
-                platformText(f.modifier) {
-                    it.takeIf { it !in ignoredModifiers }?.let {
-                        if (it is JavaModifier.Empty) KotlinModifier.Open else it
-                    }?.name?.let { "$it " } ?: ""
-                }
-                text(f.modifiers().toSignatureString())
-                text("fun ")
-                list(f.generics, prefix = "<", suffix = "> ") {
-                    +buildSignature(it)
-                }
-                f.receiver?.also {
-                    signatureForProjection(it.type)
-                    text(".")
-                }
-                link(f.name, f.dri)
-                text("(")
-                list(f.parameters) {
-                    annotationsInline(it)
-                    text(it.modifiers().toSignatureString())
-                    text(it.name!!)
-                    text(": ")
-                    signatureForProjection(it.type)
-                }
-                text(")")
-                if (f.documentReturnType()) {
-                    text(": ")
-                    signatureForProjection(f.type)
-                }
+            annotationsBlock(f)
+            platformText(f.visibility) { it.takeIf { it !in ignoredVisibilities }?.name?.let { "$it " } ?: "" }
+            platformText(f.modifier) {
+                it.takeIf { it !in ignoredModifiers }?.let {
+                    if (it is JavaModifier.Empty) KotlinModifier.Open else it
+                }?.name?.let { "$it " } ?: ""
+            }
+            platformText(f.modifiers()) { it.toSignatureString() }
+            text("fun ")
+            list(f.generics, prefix = "<", suffix = "> ") {
+                +buildSignature(it)
+            }
+            f.receiver?.also {
+                signatureForProjection(it.type)
+                text(".")
+            }
+            link(f.name, f.dri)
+            text("(")
+            list(f.parameters) {
+                annotationsInline(it)
+                platformText(it.modifiers()) { it.toSignatureString() }
+                text(it.name!!)
+                text(": ")
+                signatureForProjection(it.type)
+            }
+            text(")")
+            if (f.documentReturnType()) {
+                text(": ")
+                signatureForProjection(f.type)
             }
         }
 
@@ -204,7 +200,7 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
                     sourceSets = platforms.toSet()
                 ) {
                     platformText(t.visibility) { it.takeIf { it !in ignoredVisibilities }?.name?.let { "$it " } ?: "" }
-                    text(t.modifiers().toSignatureString())
+                    platformText(t.modifiers()) { it.toSignatureString() }
                     text("typealias ")
                     signatureForProjection(t.type)
                     text(" = ")
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureUtils.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureUtils.kt
index 48cfe304..1f323473 100644
--- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureUtils.kt
+++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureUtils.kt
@@ -19,5 +19,7 @@ object KotlinSignatureUtils : JvmSignatureUtils {
         annotationsInlineWithIgnored(d, emptySet(), strategy, listBrackets, classExtension)
 
     override fun <T : Documentable> WithExtraProperties<T>.modifiers() =
-        extra[AdditionalModifiers]?.content?.filterIsInstance<ExtraModifiers.KotlinOnlyModifiers>()?.toSet() ?: emptySet()
+        extra[AdditionalModifiers]?.content?.entries?.map {
+            it.key to it.value.filterIsInstance<ExtraModifiers.KotlinOnlyModifiers>().toSet()
+        }?.toMap() ?: emptyMap()
 }
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index a8175405..bf92c849 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -146,7 +146,10 @@ private class DokkaDescriptorVisitor(
             generics = descriptor.declaredTypeParameters.map { it.toTypeParameter() },
             companion = descriptor.companion(driWithPlatform),
             sourceSets = listOf(sourceSet),
-            extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
+            extra = PropertyContainer.withAll(
+                descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
+                descriptor.getAnnotations().toSourceSetDependent().toAnnotations()
+            )
         )
     }
 
@@ -169,7 +172,10 @@ private class DokkaDescriptorVisitor(
             supertypes = info.supertypes.toSourceSetDependent(),
             documentation = info.docs,
             sourceSets = listOf(sourceSet),
-            extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
+            extra = PropertyContainer.withAll(
+                descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
+                descriptor.getAnnotations().toSourceSetDependent().toAnnotations()
+            )
         )
     }
 
@@ -194,7 +200,10 @@ private class DokkaDescriptorVisitor(
             documentation = info.docs,
             companion = descriptor.companion(driWithPlatform),
             sourceSets = listOf(sourceSet),
-            extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
+            extra = PropertyContainer.withAll(
+                descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
+                descriptor.getAnnotations().toSourceSetDependent().toAnnotations()
+            )
         )
     }
 
@@ -213,8 +222,8 @@ private class DokkaDescriptorVisitor(
             sourceSets = listOf(sourceSet),
             expectPresentInSet = sourceSet.takeIf { isExpect },
             extra = PropertyContainer.withAll(
-                descriptor.additionalExtras(),
-                descriptor.getAnnotations(),
+                descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
+                descriptor.getAnnotations().toSourceSetDependent().toAnnotations(),
                 ConstructorValues(descriptor.getAppliedConstructorParameters().toSourceSetDependent())
             )
         )
@@ -233,7 +242,10 @@ private class DokkaDescriptorVisitor(
             properties = scope.properties(driWithPlatform),
             expectPresentInSet = null,
             sourceSets = listOf(sourceSet),
-            extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations()),
+            extra = PropertyContainer.withAll(
+                descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
+                descriptor.getAnnotations().toSourceSetDependent().toAnnotations()
+            ),
             companion = descriptor.companionObjectDescriptor?.let { objectDescriptor(it, driWithPlatform) },
             visibility = descriptor.visibility.toDokkaVisibility().toSourceSetDependent(),
             generics = descriptor.declaredTypeParameters.map { it.toTypeParameter() },
@@ -271,7 +283,10 @@ private class DokkaDescriptorVisitor(
             modifier = descriptor.modifier().toSourceSetDependent(),
             companion = descriptor.companion(driWithPlatform),
             sourceSets = listOf(sourceSet),
-            extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
+            extra = PropertyContainer.withAll(
+                descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
+                descriptor.getAnnotations().toSourceSetDependent().toAnnotations()
+            )
         )
     }
 
@@ -301,9 +316,9 @@ private class DokkaDescriptorVisitor(
             sourceSets = listOf(sourceSet),
             generics = descriptor.typeParameters.map { it.toTypeParameter() },
             extra = PropertyContainer.withAll(
-                (descriptor.additionalExtras() + (descriptor.backingField?.getAnnotationsAsExtraModifiers()?.entries?.single()?.value
-                    ?: emptyList())).toProperty(),
-                descriptor.getAllAnnotations()
+                (descriptor.additionalExtras() + descriptor.getAnnotationsWithBackingField()
+                    .toAdditionalExtras()).toSet().toSourceSetDependent().toAdditionalModifiers(),
+                descriptor.getAnnotationsWithBackingField().toSourceSetDependent().toAnnotations()
             )
         )
     }
@@ -339,7 +354,8 @@ private class DokkaDescriptorVisitor(
             sourceSets = listOf(sourceSet),
             extra = PropertyContainer.withAll(
                 InheritedFunction(isInherited),
-                descriptor.additionalExtras(), descriptor.getAnnotations()
+                descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
+                descriptor.getAnnotations().toSourceSetDependent().toAnnotations()
             )
         )
     }
@@ -379,12 +395,14 @@ private class DokkaDescriptorVisitor(
             modifier = descriptor.modifier().toSourceSetDependent(),
             generics = descriptor.typeParameters.map { it.toTypeParameter() },
             sourceSets = listOf(sourceSet),
-            extra = PropertyContainer.withAll<DFunction>(descriptor.additionalExtras(), descriptor.getAnnotations())
-                .let {
-                    if (descriptor.isPrimary) {
-                        it + PrimaryConstructorExtra
-                    } else it
-                }
+            extra = PropertyContainer.withAll<DFunction>(
+                descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
+                descriptor.getAnnotations().toSourceSetDependent().toAnnotations()
+            ).let {
+                if (descriptor.isPrimary) {
+                    it + PrimaryConstructorExtra
+                } else it
+            }
         )
     }
 
@@ -398,7 +416,7 @@ private class DokkaDescriptorVisitor(
         expectPresentInSet = null,
         documentation = descriptor.resolveDescriptorData(),
         sourceSets = listOf(sourceSet),
-        extra = PropertyContainer.withAll(descriptor.getAnnotations())
+        extra = PropertyContainer.withAll(descriptor.getAnnotations().toSourceSetDependent().toAnnotations())
     )
 
     private fun visitPropertyAccessorDescriptor(
@@ -418,7 +436,10 @@ private class DokkaDescriptorVisitor(
                 expectPresentInSet = sourceSet.takeIf { isExpect },
                 documentation = descriptor.resolveDescriptorData(),
                 sourceSets = listOf(sourceSet),
-                extra = PropertyContainer.withAll(descriptor.additionalExtras(), getAllAnnotations())
+                extra = PropertyContainer.withAll(
+                    descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
+                    getAnnotationsWithBackingField().toSourceSetDependent().toAnnotations()
+                )
             )
 
         val name = run {
@@ -453,7 +474,10 @@ private class DokkaDescriptorVisitor(
             },
             sources = descriptor.createSources(),
             sourceSets = listOf(sourceSet),
-            extra = PropertyContainer.withAll(descriptor.additionalExtras(), descriptor.getAnnotations())
+            extra = PropertyContainer.withAll(
+                descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
+                descriptor.getAnnotations().toSourceSetDependent().toAnnotations()
+            )
         )
     }
 
@@ -479,12 +503,11 @@ private class DokkaDescriptorVisitor(
             expectPresentInSet = null,
             documentation = descriptor.resolveDescriptorData(),
             sourceSets = listOf(sourceSet),
-            extra = PropertyContainer.withAll(
-                listOfNotNull(
-                    descriptor.additionalExtras(),
-                    descriptor.getAnnotations(),
-                    descriptor.getDefaultValue()?.let { DefaultValue(it) })
-            )
+            extra = PropertyContainer.withAll(listOfNotNull(
+                descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
+                descriptor.getAnnotations().toSourceSetDependent().toAnnotations(),
+                descriptor.getDefaultValue()?.let { DefaultValue(it) }
+            ))
         )
 
     private fun MemberScope.getContributedDescriptors(kindFilter: DescriptorKindFilter, shouldFilter: Boolean) =
@@ -542,7 +565,7 @@ private class DokkaDescriptorVisitor(
             null,
             upperBounds.map { it.toBound() },
             listOf(sourceSet),
-            extra = PropertyContainer.withAll(additionalExtras())
+            extra = PropertyContainer.withAll(additionalExtras().toSourceSetDependent().toAdditionalModifiers())
         )
 
     private fun KotlinType.toBound(): Bound = when (this) {
@@ -606,28 +629,26 @@ private class DokkaDescriptorVisitor(
         ExtraModifiers.KotlinOnlyModifiers.TailRec.takeIf { isTailrec },
         ExtraModifiers.KotlinOnlyModifiers.External.takeIf { isExternal },
         ExtraModifiers.KotlinOnlyModifiers.Override.takeIf { DescriptorUtils.isOverride(this) }
-    ).toProperty()
+    ).toSet()
 
     private fun ClassDescriptor.additionalExtras() = listOfNotNull(
         ExtraModifiers.KotlinOnlyModifiers.Inline.takeIf { isInline },
         ExtraModifiers.KotlinOnlyModifiers.External.takeIf { isExternal },
         ExtraModifiers.KotlinOnlyModifiers.Inner.takeIf { isInner },
         ExtraModifiers.KotlinOnlyModifiers.Data.takeIf { isData }
-    ).toProperty()
-
-    private fun ValueParameterDescriptor.additionalExtras() =
-        listOfNotNull(
-            ExtraModifiers.KotlinOnlyModifiers.NoInline.takeIf { isNoinline },
-            ExtraModifiers.KotlinOnlyModifiers.CrossInline.takeIf { isCrossinline },
-            ExtraModifiers.KotlinOnlyModifiers.Const.takeIf { isConst },
-            ExtraModifiers.KotlinOnlyModifiers.LateInit.takeIf { isLateInit },
-            ExtraModifiers.KotlinOnlyModifiers.VarArg.takeIf { isVararg }
-        ).toProperty()
-
-    private fun TypeParameterDescriptor.additionalExtras() =
-        listOfNotNull(
-            ExtraModifiers.KotlinOnlyModifiers.Reified.takeIf { isReified }
-        ).toProperty()
+    ).toSet()
+
+    private fun ValueParameterDescriptor.additionalExtras() = listOfNotNull(
+        ExtraModifiers.KotlinOnlyModifiers.NoInline.takeIf { isNoinline },
+        ExtraModifiers.KotlinOnlyModifiers.CrossInline.takeIf { isCrossinline },
+        ExtraModifiers.KotlinOnlyModifiers.Const.takeIf { isConst },
+        ExtraModifiers.KotlinOnlyModifiers.LateInit.takeIf { isLateInit },
+        ExtraModifiers.KotlinOnlyModifiers.VarArg.takeIf { isVararg }
+    ).toSet()
+
+    private fun TypeParameterDescriptor.additionalExtras() = listOfNotNull(
+        ExtraModifiers.KotlinOnlyModifiers.Reified.takeIf { isReified }
+    ).toSet()
 
     private fun PropertyDescriptor.additionalExtras() = listOfNotNull(
         ExtraModifiers.KotlinOnlyModifiers.Const.takeIf { isConst },
@@ -637,13 +658,7 @@ private class DokkaDescriptorVisitor(
         ExtraModifiers.KotlinOnlyModifiers.Override.takeIf { DescriptorUtils.isOverride(this) }
     )
 
-    private fun List<ExtraModifiers>.toProperty() =
-        AdditionalModifiers(this.toSet())
-
-    private fun Annotated.getAnnotations() = getListOfSourceSetDependentAnnotations().let(::Annotations)
-
-    private fun Annotated.getListOfSourceSetDependentAnnotations() =
-        mapOf(sourceSet to annotations.mapNotNull { it.toAnnotation() })
+    private fun Annotated.getAnnotations() = annotations.mapNotNull { it.toAnnotation() }
 
     private fun ConstantValue<*>.toValue(): AnnotationParameterValue? = when (this) {
         is ConstantsAnnotationValue -> value.toAnnotation()?.let { AnnotationValue(it) }
@@ -670,30 +685,31 @@ private class DokkaDescriptorVisitor(
     }
 
     private fun AnnotationDescriptor.toAnnotation(): Annotations.Annotation? =
-        DRI.from(annotationClass as DeclarationDescriptor)
-            .takeIf { it.classNames != "<ERROR CLASS>" }?.let {
-                Annotations.Annotation(
-                    it,
-                    allValueArguments.map { it.key.asString() to it.value.toValue() }.filter {
-                        it.second != null
-                    }.toMap() as Map<String, AnnotationParameterValue>
-                )
-            }
+        if(annotationClass?.visibility == Visibilities.PUBLIC)
+            DRI.from(annotationClass as DeclarationDescriptor)
+                .takeIf { it.classNames != "<ERROR CLASS>" }?.let {
+                    Annotations.Annotation(
+                        it,
+                        allValueArguments.map { it.key.asString() to it.value.toValue() }.filter {
+                            it.second != null
+                        }.toMap() as Map<String, AnnotationParameterValue>
+                    )
+                }
+        else
+            null
 
-    private fun PropertyDescriptor.getAllAnnotations(): Annotations =
-        (getListOfSourceSetDependentAnnotations() + (backingField?.getListOfSourceSetDependentAnnotations()
-            ?: emptyMap())).let(::Annotations)
+    private fun PropertyDescriptor.getAnnotationsWithBackingField(): List<Annotations.Annotation> =
+        getAnnotations() + (backingField?.getAnnotations() ?: emptyList())
 
-    private fun FieldDescriptor.getAnnotationsAsExtraModifiers() = getAnnotations().content.mapValues {
-        it.value.mapNotNull {
-            try {
-                ExtraModifiers.valueOf(it.dri.classNames?.toLowerCase() ?: "")
-            } catch (e: IllegalArgumentException) {
-                null
-            }
+    private fun List<Annotations.Annotation>.toAdditionalExtras() = mapNotNull {
+        try {
+            ExtraModifiers.valueOf(it.dri.classNames?.toLowerCase() ?: "")
+        } catch (e: IllegalArgumentException) {
+            null
         }
     }
 
+
     private fun ValueParameterDescriptor.getDefaultValue(): String? =
         (source as? KotlinSourceElement)?.psi?.children?.find { it is KtExpression }?.text
 
diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
index 1f52b2d9..d68f0e01 100644
--- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
@@ -116,8 +116,7 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
             return false
         }
 
-        private fun <T> T.toPlatformDependant() =
-            mapOf(sourceSetData to this)
+        private fun <T> T.toSourceSetDependent() = mapOf(sourceSetData to this)
 
         fun parseClasslike(psi: PsiClass, parent: DRI): DClasslike = with(psi) {
             val dri = parent.withClass(name.toString())
@@ -144,14 +143,14 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
             }
             parseSupertypes(superTypes)
             val (regularFunctions, accessors) = splitFunctionsAndAccessors()
-            val documentation = javadocParser.parseDocumentation(this).toPlatformDependant()
+            val documentation = javadocParser.parseDocumentation(this).toSourceSetDependent()
             val allFunctions = regularFunctions.mapNotNull { if (!it.isConstructor) parseFunction(it) else null } +
                     superMethods.map { parseFunction(it, isInherited = true) }
-            val source = PsiDocumentableSource(this).toPlatformDependant()
+            val source = PsiDocumentableSource(this).toSourceSetDependent()
             val classlikes = innerClasses.map { parseClasslike(it, dri) }
-            val visibility = getVisibility().toPlatformDependant()
-            val ancestors = ancestorsSet.toList().toPlatformDependant()
-            val modifiers = getModifier().toPlatformDependant()
+            val visibility = getVisibility().toSourceSetDependent()
+            val ancestors = ancestorsSet.toList().toSourceSetDependent()
+            val modifiers = getModifier().toSourceSetDependent()
             return when {
                 isAnnotationType ->
                     DAnnotation(
@@ -168,8 +167,8 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                         constructors.map { parseFunction(it, true) },
                         mapTypeParameters(dri),
                         listOf(sourceSetData),
-                        PropertyContainer.empty<DAnnotation>() + annotations.toList().toListOfAnnotations()
-                            .let(::Annotations)
+                        PropertyContainer.empty<DAnnotation>() + annotations.toList().getAnnotations()
+                            .toSourceSetDependent().toAnnotations()
                     )
                 isEnum -> DEnum(
                     dri,
@@ -178,14 +177,14 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                         DEnumEntry(
                             dri.withClass("$name.${entry.name}"),
                             entry.name.orEmpty(),
-                            javadocParser.parseDocumentation(entry).toPlatformDependant(),
+                            javadocParser.parseDocumentation(entry).toSourceSetDependent(),
                             null,
                             emptyList(),
                             emptyList(),
                             emptyList(),
                             listOf(sourceSetData),
-                            PropertyContainer.empty<DEnumEntry>() + entry.annotations.toList().toListOfAnnotations()
-                                .let(::Annotations)
+                            PropertyContainer.empty<DEnumEntry>() + entry.annotations.toList().getAnnotations()
+                                .toSourceSetDependent().toAnnotations()
                         )
                     },
                     documentation,
@@ -199,7 +198,8 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                     constructors.map { parseFunction(it, true) },
                     ancestors,
                     listOf(sourceSetData),
-                    PropertyContainer.empty<DEnum>() + annotations.toList().toListOfAnnotations().let(::Annotations)
+                    PropertyContainer.empty<DEnum>() + annotations.toList().getAnnotations().toSourceSetDependent()
+                        .toAnnotations()
                 )
                 isInterface -> DInterface(
                     dri,
@@ -215,8 +215,8 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                     mapTypeParameters(dri),
                     ancestors,
                     listOf(sourceSetData),
-                    PropertyContainer.empty<DInterface>() + annotations.toList().toListOfAnnotations()
-                        .let(::Annotations)
+                    PropertyContainer.empty<DInterface>() + annotations.toList().getAnnotations().toSourceSetDependent()
+                        .toAnnotations()
                 )
                 else -> DClass(
                     dri,
@@ -234,7 +234,8 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                     null,
                     modifiers,
                     listOf(sourceSetData),
-                    PropertyContainer.empty<DClass>() + annotations.toList().toListOfAnnotations().let(::Annotations)
+                    PropertyContainer.empty<DClass>() + annotations.toList().getAnnotations().toSourceSetDependent()
+                        .toAnnotations()
                 )
             }
         }
@@ -253,49 +254,49 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                     DParameter(
                         dri.copy(target = dri.target.nextTarget()),
                         psiParameter.name,
-                        javadocParser.parseDocumentation(psiParameter).toPlatformDependant(),
+                        javadocParser.parseDocumentation(psiParameter).toSourceSetDependent(),
                         null,
                         getBound(psiParameter.type),
                         listOf(sourceSetData)
                     )
                 },
-                javadocParser.parseDocumentation(psi).toPlatformDependant(),
+                javadocParser.parseDocumentation(psi).toSourceSetDependent(),
                 null,
-                PsiDocumentableSource(psi).toPlatformDependant(),
-                psi.getVisibility().toPlatformDependant(),
+                PsiDocumentableSource(psi).toSourceSetDependent(),
+                psi.getVisibility().toSourceSetDependent(),
                 psi.returnType?.let { getBound(type = it) } ?: Void,
                 psi.mapTypeParameters(dri),
                 null,
-                psi.getModifier().toPlatformDependant(),
+                psi.getModifier().toSourceSetDependent(),
                 listOf(sourceSetData),
                 psi.additionalExtras().let {
                     PropertyContainer.withAll(
                         InheritedFunction(isInherited),
-                        it,
-                        (psi.annotations.toList().toListOfAnnotations() + it.toListOfAnnotations()).let(::Annotations)
+                        it.toSourceSetDependent().toAdditionalModifiers(),
+                        (psi.annotations.toList().getAnnotations() + it.getAnnotations()).toSourceSetDependent()
+                            .toAnnotations()
                     )
                 }
             )
         }
 
-        private fun PsiModifierListOwner.additionalExtras() = AdditionalModifiers(
-            listOfNotNull(
-                ExtraModifiers.JavaOnlyModifiers.Static.takeIf { hasModifier(JvmModifier.STATIC) },
-                ExtraModifiers.JavaOnlyModifiers.Native.takeIf { hasModifier(JvmModifier.NATIVE) },
-                ExtraModifiers.JavaOnlyModifiers.Synchronized.takeIf { hasModifier(JvmModifier.SYNCHRONIZED) },
-                ExtraModifiers.JavaOnlyModifiers.StrictFP.takeIf { hasModifier(JvmModifier.STRICTFP) },
-                ExtraModifiers.JavaOnlyModifiers.Transient.takeIf { hasModifier(JvmModifier.TRANSIENT) },
-                ExtraModifiers.JavaOnlyModifiers.Volatile.takeIf { hasModifier(JvmModifier.VOLATILE) },
-                ExtraModifiers.JavaOnlyModifiers.Transitive.takeIf { hasModifier(JvmModifier.TRANSITIVE) }
-            ).toSet()
-        )
+        private fun PsiModifierListOwner.additionalExtras() = listOfNotNull(
+            ExtraModifiers.JavaOnlyModifiers.Static.takeIf { hasModifier(JvmModifier.STATIC) },
+            ExtraModifiers.JavaOnlyModifiers.Native.takeIf { hasModifier(JvmModifier.NATIVE) },
+            ExtraModifiers.JavaOnlyModifiers.Synchronized.takeIf { hasModifier(JvmModifier.SYNCHRONIZED) },
+            ExtraModifiers.JavaOnlyModifiers.StrictFP.takeIf { hasModifier(JvmModifier.STRICTFP) },
+            ExtraModifiers.JavaOnlyModifiers.Transient.takeIf { hasModifier(JvmModifier.TRANSIENT) },
+            ExtraModifiers.JavaOnlyModifiers.Volatile.takeIf { hasModifier(JvmModifier.VOLATILE) },
+            ExtraModifiers.JavaOnlyModifiers.Transitive.takeIf { hasModifier(JvmModifier.TRANSITIVE) }
+        ).toSet()
+
 
-        private fun AdditionalModifiers.toListOfAnnotations() = mapOf(sourceSetData to this.content.map {
+        private fun Set<ExtraModifiers>.getAnnotations() = map {
             if (it !is ExtraModifiers.JavaOnlyModifiers.Static)
                 Annotations.Annotation(DRI("kotlin.jvm", it.name.toLowerCase().capitalize()), emptyMap())
             else
                 Annotations.Annotation(DRI("kotlin.jvm", "JvmStatic"), emptyMap())
-        })
+        }
 
         private fun getBound(type: PsiType): Bound =
             cachedBounds.getOrPut(type.canonicalText) {
@@ -346,7 +347,7 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
                 DTypeParameter(
                     dri.copy(target = dri.target.nextTarget()),
                     type.name.orEmpty(),
-                    javadocParser.parseDocumentation(type).toPlatformDependant(),
+                    javadocParser.parseDocumentation(type).toSourceSetDependent(),
                     null,
                     mapBounds(type.bounds),
                     listOf(sourceSetData)
@@ -383,41 +384,39 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
             return DProperty(
                 dri,
                 psi.name!!, // TODO: Investigate if this is indeed nullable
-                javadocParser.parseDocumentation(psi).toPlatformDependant(),
+                javadocParser.parseDocumentation(psi).toSourceSetDependent(),
                 null,
-                PsiDocumentableSource(psi).toPlatformDependant(),
-                psi.getVisibility().toPlatformDependant(),
+                PsiDocumentableSource(psi).toSourceSetDependent(),
+                psi.getVisibility().toSourceSetDependent(),
                 getBound(psi.type),
                 null,
                 accessors.firstOrNull { it.hasParameters() }?.let { parseFunction(it) },
                 accessors.firstOrNull { it.returnType == psi.type }?.let { parseFunction(it) },
-                psi.getModifier().toPlatformDependant(),
+                psi.getModifier().toSourceSetDependent(),
                 listOf(sourceSetData),
                 emptyList(),
                 psi.additionalExtras().let {
                     PropertyContainer.withAll<DProperty>(
-                        it,
-                        (psi.annotations.toList().toListOfAnnotations() + it.toListOfAnnotations()).let(::Annotations)
+                        it.toSourceSetDependent().toAdditionalModifiers(),
+                        (psi.annotations.toList().getAnnotations() + it.getAnnotations()).toSourceSetDependent()
+                            .toAnnotations()
                     )
                 }
             )
         }
 
-        private fun Collection<PsiAnnotation>.toListOfAnnotations() =
-            mapOf(sourceSetData to filter { it !is KtLightAbstractAnnotation }.mapNotNull { it.toAnnotation() })
+        private fun Collection<PsiAnnotation>.getAnnotations() =
+            filter { it !is KtLightAbstractAnnotation }.mapNotNull { it.toAnnotation() }
 
         private fun JvmAnnotationAttribute.toValue(): AnnotationParameterValue = when (this) {
             is PsiNameValuePair -> value?.toValue() ?: StringValue("")
             else -> StringValue(this.attributeName)
         }
 
-        private fun PsiAnnotationMemberValue.toValue(): AnnotationParameterValue = when (this) {
-            is PsiAnnotation -> AnnotationValue(toAnnotation())
-            is PsiArrayInitializerMemberValue -> ArrayValue(initializers.map { it.toValue() })
-            is PsiReferenceExpression -> EnumValue(
-                text ?: "",
-                driOfReference()
-            )
+        private fun PsiAnnotationMemberValue.toValue(): AnnotationParameterValue? = when (this) {
+            is PsiAnnotation -> toAnnotation()?.let { AnnotationValue(it) }
+            is PsiArrayInitializerMemberValue -> ArrayValue(initializers.mapNotNull { it.toValue() })
+            is PsiReferenceExpression -> driOfReference()?.let { EnumValue(text ?: "", it) }
             is PsiClassObjectAccessExpression -> ClassValue(
                 text ?: "",
                 DRI.from(((type as PsiImmediateClassType).parameters.single() as PsiClassReferenceType).resolve()!!)
@@ -425,16 +424,16 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
             else -> StringValue(text ?: "")
         }
 
-        private fun PsiAnnotation.toAnnotation() = Annotations.Annotation(
-            driOfReference(),
-            attributes.filter { it !is KtLightAbstractAnnotation }.mapNotNull { it.attributeName to it.toValue() }
-                .toMap()
-        )
+        private fun PsiAnnotation.toAnnotation() = driOfReference()?.let {
+            Annotations.Annotation(
+                it,
+                attributes.filter { it !is KtLightAbstractAnnotation }.mapNotNull { it.attributeName to it.toValue() }
+                    .toMap()
+            )
+        }
 
         private fun PsiElement.driOfReference() = getChildOfType<PsiJavaCodeReferenceElement>()?.resolve()?.let {
             DRI.from(it)
-        } ?: DRI("", getChildOfType<PsiJavaCodeReferenceElement>()?.qualifiedName ?: "").also {
-            logger.error("$this cannot be resolved to symbol!")
         }
     }
 }
diff --git a/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt b/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt
index 98f572b4..d10bd151 100644
--- a/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt
+++ b/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt
@@ -149,6 +149,4 @@ class ContentForAnnotationsTest : AbstractCoreTest() {
             }
         }
     }
-
-
 }
\ No newline at end of file
diff --git a/plugins/base/src/test/kotlin/model/ClassesTest.kt b/plugins/base/src/test/kotlin/model/ClassesTest.kt
index 4ca34b00..5616a6c3 100644
--- a/plugins/base/src/test/kotlin/model/ClassesTest.kt
+++ b/plugins/base/src/test/kotlin/model/ClassesTest.kt
@@ -1,5 +1,6 @@
 package model
 
+import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.KotlinModifier.*
 import org.junit.jupiter.api.Assertions.assertNull
@@ -150,9 +151,9 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             with((this / "classes" / "Klass").cast<DClass>()) {
                 name equals "Klass"
                 visibility.values allEquals KotlinVisibility.Public
-                with(extra[AdditionalModifiers].assertNotNull("Extras")) {
-                    content counts 1
-                    content.first() equals ExtraModifiers.KotlinOnlyModifiers.Data
+                with(extra[AdditionalModifiers]!!.content.entries.single().value.assertNotNull("Extras")) {
+                    this counts 1
+                    first() equals ExtraModifiers.KotlinOnlyModifiers.Data
                 }
             }
         }
@@ -180,9 +181,9 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
                 """
         ) {
             with((this / "classes" / "Foo").cast<DClass>()) {
-                with(extra[Annotations].assertNotNull("Annotations")) {
-                    this.content counts 1
-                    with(content.first()) {
+                with(extra[Annotations]!!.content.entries.single().value.assertNotNull("Annotations")) {
+                    this counts 1
+                    with(first()) {
                         dri.classNames equals "Deprecated"
                         params.entries counts 1
                         (params["message"].assertNotNull("message") as StringValue).value equals "\"should no longer be used\""
@@ -273,9 +274,9 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             with((this / "classes" / "C").cast<DClass>()) {
 
                 with((this / "D").cast<DClass>()) {
-                    with(extra[AdditionalModifiers].assertNotNull("AdditionalModifiers")) {
-                        content counts 1
-                        content.first() equals ExtraModifiers.KotlinOnlyModifiers.Inner
+                    with(extra[AdditionalModifiers]!!.content.entries.single().value.assertNotNull("AdditionalModifiers")) {
+                        this counts 1
+                        first() equals ExtraModifiers.KotlinOnlyModifiers.Inner
                     }
                 }
             }
@@ -359,9 +360,9 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
                 """
         ) {
             with((this / "classes" / "C").cast<DClass>()) {
-                with(extra[Annotations].assertNotNull("Annotations")) {
-                    this.content counts 1
-                    with(content.first()) {
+                with(extra[Annotations]!!.content.entries.single().value.assertNotNull("Annotations")) {
+                    this counts 1
+                    with(first()) {
                         dri.classNames equals "SinceKotlin"
                         params.entries counts 1
                         (params["version"].assertNotNull("version") as StringValue).value equals "\"1.1\""
@@ -424,7 +425,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             """@Suppress("abc") class Foo() {}"""
         ) {
             with((this / "classes" / "Foo").cast<DClass>()) {
-                with(extra[Annotations]?.content?.firstOrNull().assertNotNull("annotations")) {
+                with(extra[Annotations]!!.content.entries.single().value.firstOrNull().assertNotNull("annotations")) {
                     dri.toString() equals "kotlin/Suppress///PointingToDeclaration/"
                     (params["names"].assertNotNull("param") as ArrayValue).value equals listOf(StringValue("\"abc\""))
                 }
@@ -444,11 +445,14 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             """
         ) {
             with((this / "classes" / "throws").cast<DAnnotation>()) {
-                with(extra[Annotations].assertNotNull("Annotations")) {
-                    content counts 1
-                    with(content.first()) {
+                with(extra[Annotations]!!.content.entries.single().value.assertNotNull("Annotations")) {
+                    this counts 1
+                    with(first()) {
                         dri.classNames equals "Retention"
-//                        params["value"].assertNotNull("value") equals "(java/lang/annotation/RetentionPolicy, SOURCE)"
+                        params["value"].assertNotNull("value") equals EnumValue(
+                            "RetentionPolicy.SOURCE",
+                            DRI("java.lang.annotation", "RetentionPolicy.SOURCE")
+                        )
                     }
                 }
             }
diff --git a/plugins/base/src/test/kotlin/model/FunctionsTest.kt b/plugins/base/src/test/kotlin/model/FunctionsTest.kt
index 38f64df5..c96e7df6 100644
--- a/plugins/base/src/test/kotlin/model/FunctionsTest.kt
+++ b/plugins/base/src/test/kotlin/model/FunctionsTest.kt
@@ -141,9 +141,9 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
         """
         ) {
             with((this / "function" / "f").cast<DFunction>()) {
-                with(extra[Annotations].assertNotNull("Annotations")) {
-                    content counts 1
-                    with(content.first()) {
+                with(extra[Annotations]!!.content.entries.single().value.assertNotNull("Annotations")) {
+                    this counts 1
+                    with(first()) {
                         dri.classNames equals "Suppress"
                         params.entries counts 1
                         (params["names"].assertNotNull("param") as ArrayValue).value equals listOf(StringValue("\"FOO\""))
@@ -161,8 +161,8 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
         """
         ) {
             with((this / "function" / "f").cast<DFunction>()) {
-                extra[AdditionalModifiers]?.content counts 1
-                extra[AdditionalModifiers]?.content exists ExtraModifiers.KotlinOnlyModifiers.Inline
+                extra[AdditionalModifiers]!!.content.entries.single().value counts 1
+                extra[AdditionalModifiers]!!.content.entries.single().value exists ExtraModifiers.KotlinOnlyModifiers.Inline
             }
         }
     }
@@ -175,8 +175,8 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
         """
         ) {
             with((this / "function" / "f").cast<DFunction>()) {
-                extra[AdditionalModifiers]?.content counts 1
-                extra[AdditionalModifiers]?.content exists ExtraModifiers.KotlinOnlyModifiers.Suspend
+                extra[AdditionalModifiers]!!.content.entries.single().value counts 1
+                extra[AdditionalModifiers]!!.content.entries.single().value exists ExtraModifiers.KotlinOnlyModifiers.Suspend
             }
         }
     }
@@ -189,9 +189,9 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
         """
         ) {
             with((this / "function" / "f").cast<DFunction>()) {
-                extra[AdditionalModifiers]?.content counts 2
-                extra[AdditionalModifiers]?.content exists ExtraModifiers.KotlinOnlyModifiers.Suspend
-                extra[AdditionalModifiers]?.content exists ExtraModifiers.KotlinOnlyModifiers.Inline
+                extra[AdditionalModifiers]!!.content.entries.single().value counts 2
+                extra[AdditionalModifiers]!!.content.entries.single().value exists ExtraModifiers.KotlinOnlyModifiers.Suspend
+                extra[AdditionalModifiers]!!.content.entries.single().value exists ExtraModifiers.KotlinOnlyModifiers.Inline
             }
         }
     }
@@ -204,10 +204,10 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
         """
         ) {
             with((this / "function" / "f").cast<DFunction>()) {
-                with(extra[AdditionalModifiers].assertNotNull("AdditionalModifiers")) {
-                    content counts 2
-                    content exists ExtraModifiers.KotlinOnlyModifiers.Suspend
-                    content exists ExtraModifiers.KotlinOnlyModifiers.Inline
+                with(extra[AdditionalModifiers]!!.content.entries.single().value.assertNotNull("AdditionalModifiers")) {
+                    this counts 2
+                    this exists ExtraModifiers.KotlinOnlyModifiers.Suspend
+                    this exists ExtraModifiers.KotlinOnlyModifiers.Inline
                 }
             }
         }
@@ -226,9 +226,9 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
         """
         ) {
             with((this / "function" / "Fancy").cast<DAnnotation>()) {
-                with(extra[Annotations].assertNotNull("Annotations")) {
-                    content counts 3
-                    with(content.map { it.dri.classNames to it }.toMap()) {
+                with(extra[Annotations]!!.content.entries.single().value.assertNotNull("Annotations")) {
+                    this counts 3
+                    with(map { it.dri.classNames to it }.toMap()) {
                         with(this["Target"].assertNotNull("Target")) {
                             (params["allowedTargets"].assertNotNull("allowedTargets") as ArrayValue).value equals listOf(
                                 EnumValue(
@@ -249,9 +249,9 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
 
             }
             with((this / "function" / "function" / "notInlined").cast<DParameter>()) {
-                with(this.extra[Annotations].assertNotNull("Annotations")) {
-                    content counts 1
-                    with(content.first()) {
+                with(this.extra[Annotations]!!.content.entries.single().value.assertNotNull("Annotations")) {
+                    this counts 1
+                    with(first()) {
                         dri.classNames equals "Fancy"
                         params.entries counts 0
                     }
@@ -268,8 +268,8 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
         """
         ) {
             with((this / "function" / "f" / "notInlined").cast<DParameter>()) {
-                extra[AdditionalModifiers]?.content counts 1
-                extra[AdditionalModifiers]?.content exists ExtraModifiers.KotlinOnlyModifiers.NoInline
+                extra[AdditionalModifiers]!!.content.entries.single().value counts 1
+                extra[AdditionalModifiers]!!.content.entries.single().value exists ExtraModifiers.KotlinOnlyModifiers.NoInline
             }
         }
     }
@@ -296,9 +296,9 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
                     }
                 }
 
-                with(extra[Annotations].assertNotNull("Annotations")) {
-                    content counts 3
-                    with(content.map { it.dri.classNames to it }.toMap()) {
+                with(extra[Annotations]!!.content.entries.single().value.assertNotNull("Annotations")) {
+                    this counts 3
+                    with(map { it.dri.classNames to it }.toMap()) {
                         with(this["Target"].assertNotNull("Target")) {
                             (params["allowedTargets"].assertNotNull("allowedTargets") as ArrayValue).value equals listOf(
                                 EnumValue(
@@ -319,9 +319,9 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
 
             }
             with((this / "function" / "f").cast<DFunction>()) {
-                with(this.extra[Annotations].assertNotNull("Annotations")) {
-                    content counts 1
-                    with(content.first()) {
+                with(this.extra[Annotations]!!.content.entries.single().value.assertNotNull("Annotations")) {
+                    this counts 1
+                    with(this.first()) {
                         dri.classNames equals "Fancy"
                         params.entries counts 1
                         (params["size"] as StringValue).value equals "1"
@@ -381,9 +381,9 @@ class FunctionTest : AbstractModelTest("/src/main/kotlin/function/Test.kt", "fun
                 """
         ) {
             with((this / "function" / "f").cast<DFunction>()) {
-                with(extra[Annotations].assertNotNull("Annotations")) {
-                    this.content counts 1
-                    with(content.first()) {
+                with(extra[Annotations]!!.content.entries.single().value.assertNotNull("Annotations")) {
+                    this counts 1
+                    with(first()) {
                         dri.classNames equals "SinceKotlin"
                         params.entries counts 1
                         (params["version"].assertNotNull("version") as StringValue).value equals "\"1.1\""
diff --git a/plugins/base/src/test/kotlin/model/JavaTest.kt b/plugins/base/src/test/kotlin/model/JavaTest.kt
index fd293b5c..8f52fcc8 100644
--- a/plugins/base/src/test/kotlin/model/JavaTest.kt
+++ b/plugins/base/src/test/kotlin/model/JavaTest.kt
@@ -295,9 +295,9 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             """
         ) {
             with((this / "java" / "C" / "foo").cast<DFunction>()) {
-                with(extra[AdditionalModifiers].assertNotNull("AdditionalModifiers")) {
-                    content counts 1
-                    content.first() equals ExtraModifiers.JavaOnlyModifiers.Static
+                with(extra[AdditionalModifiers]!!.content.entries.single().value.assertNotNull("AdditionalModifiers")) {
+                    this counts 1
+                    first() equals ExtraModifiers.JavaOnlyModifiers.Static
                 }
             }
         }
@@ -335,8 +335,8 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             """
         ) {
             with((this / "java" / "Attribute").cast<DAnnotation>()) {
-                with(extra[Annotations].assertNotNull("Annotations")) {
-                    with(content.single()) {
+                with(extra[Annotations]!!.content.entries.single().value.assertNotNull("Annotations")) {
+                    with(single()) {
                         dri.classNames equals "Target"
                         (params["value"].assertNotNull("value") as ArrayValue).value equals listOf(
                             EnumValue("ElementType.FIELD", DRI("java.lang.annotation", "ElementType")),
diff --git a/plugins/base/src/test/kotlin/model/PropertyTest.kt b/plugins/base/src/test/kotlin/model/PropertyTest.kt
index 90a9d782..e384b920 100644
--- a/plugins/base/src/test/kotlin/model/PropertyTest.kt
+++ b/plugins/base/src/test/kotlin/model/PropertyTest.kt
@@ -150,9 +150,9 @@ class PropertyTest : AbstractModelTest("/src/main/kotlin/property/Test.kt", "pro
                 """
         ) {
             with((this / "property" / "prop").cast<DProperty>()) {
-                with(extra[Annotations].assertNotNull("Annotations")) {
-                    this.content counts 1
-                    with(content.first()) {
+                with(extra[Annotations]!!.content.entries.single().value.assertNotNull("Annotations")) {
+                    this counts 1
+                    with(first()) {
                         dri.classNames equals "SinceKotlin"
                         params.entries counts 1
                         (params["version"].assertNotNull("version") as StringValue).value equals "\"1.1\""
@@ -178,9 +178,9 @@ class PropertyTest : AbstractModelTest("/src/main/kotlin/property/Test.kt", "pro
             }
         ) {
             with((this / "property" / "property").cast<DProperty>()) {
-                with(extra[Annotations].assertNotNull("Annotations")) {
-                    this.content counts 1
-                    with(content.first()) {
+                with(extra[Annotations]!!.content.entries.single().value.assertNotNull("Annotations")) {
+                    this counts 1
+                    with(first()) {
                         dri.classNames equals "Strictfp"
                         params.entries counts 0
                     }
diff --git a/plugins/base/src/test/kotlin/utils/contentUtils.kt b/plugins/base/src/test/kotlin/utils/contentUtils.kt
index 7e1b8bf4..c7cea1f1 100644
--- a/plugins/base/src/test/kotlin/utils/contentUtils.kt
+++ b/plugins/base/src/test/kotlin/utils/contentUtils.kt
@@ -28,36 +28,34 @@ fun ContentMatcherBuilder<*>.bareSignature(
     returnType: String? = null,
     vararg params: Pair<String, ParamAttributes>
 ) = group { // TODO: remove it when double wrapping for signatures will be resolved
-    group {
-        annotations.entries.forEach {
-            group {
-                unwrapAnnotation(it)
-            }
+    annotations.entries.forEach {
+        group {
+            unwrapAnnotation(it)
         }
-        +("$visibility $modifier ${keywords.joinToString("") { "$it " }} fun")
-        link { +name }
-        +"("
-        params.forEachIndexed { id, (n, t) ->
-
-            t.annotations.forEach {
-                unwrapAnnotation(it)
-            }
-            t.keywords.forEach {
-                +it
-            }
+    }
+    +("$visibility $modifier ${keywords.joinToString("") { "$it " }} fun")
+    link { +name }
+    +"("
+    params.forEachIndexed { id, (n, t) ->
 
-            +"$n:"
-            group { link { +(t.type) } }
-            if (id != params.lastIndex)
-                +", "
+        t.annotations.forEach {
+            unwrapAnnotation(it)
         }
-        +")"
-        if (returnType != null) {
-            +(": ")
-            group {
-                link {
-                    +(returnType)
-                }
+        t.keywords.forEach {
+            +it
+        }
+
+        +"$n:"
+        group { link { +(t.type) } }
+        if (id != params.lastIndex)
+            +", "
+    }
+    +")"
+    if (returnType != null) {
+        +(": ")
+        group {
+            link {
+                +(returnType)
             }
         }
     }
@@ -87,40 +85,38 @@ fun ContentMatcherBuilder<*>.bareSignatureWithReceiver(
     returnType: String? = null,
     vararg params: Pair<String, ParamAttributes>
 ) = group { // TODO: remove it when double wrapping for signatures will be resolved
-    group {
-        annotations.entries.forEach {
-            group {
-                unwrapAnnotation(it)
-            }
-        }
-        +("$visibility $modifier ${keywords.joinToString("") { "$it " }} fun")
+    annotations.entries.forEach {
         group {
-            link { +receiver }
+            unwrapAnnotation(it)
         }
-        +"."
-        link { +name }
-        +"("
-        params.forEachIndexed { id, (n, t) ->
-
-            t.annotations.forEach {
-                unwrapAnnotation(it)
-            }
-            t.keywords.forEach {
-                +it
-            }
+    }
+    +("$visibility $modifier ${keywords.joinToString("") { "$it " }} fun")
+    group {
+        link { +receiver }
+    }
+    +"."
+    link { +name }
+    +"("
+    params.forEachIndexed { id, (n, t) ->
 
-            +"$n:"
-            group { link { +(t.type) } }
-            if (id != params.lastIndex)
-                +", "
+        t.annotations.forEach {
+            unwrapAnnotation(it)
         }
-        +")"
-        if (returnType != null) {
-            +(": ")
-            group {
-                link {
-                    +(returnType)
-                }
+        t.keywords.forEach {
+            +it
+        }
+
+        +"$n:"
+        group { link { +(t.type) } }
+        if (id != params.lastIndex)
+            +", "
+    }
+    +")"
+    if (returnType != null) {
+        +(": ")
+        group {
+            link {
+                +(returnType)
             }
         }
     }
@@ -148,20 +144,18 @@ fun ContentMatcherBuilder<*>.propertySignature(
                     link { +name }
                     platformHinted {
                         group {
-                            group {
-                                annotations.entries.forEach {
-                                    group {
-                                        unwrapAnnotation(it)
-                                    }
+                            annotations.entries.forEach {
+                                group {
+                                    unwrapAnnotation(it)
                                 }
-                                +("$visibility $modifier ${keywords.joinToString("") { "$it " }} $preposition")
-                                link { +name }
-                                if (type != null) {
-                                    +(": ")
-                                    group {
-                                        link {
-                                            +(type)
-                                        }
+                            }
+                            +("$visibility $modifier ${keywords.joinToString("") { "$it " }} $preposition")
+                            link { +name }
+                            if (type != null) {
+                                +(": ")
+                                group {
+                                    link {
+                                        +(type)
                                     }
                                 }
                             }
@@ -184,15 +178,19 @@ fun ContentMatcherBuilder<*>.unnamedTag(tag: String, content: ContentMatcherBuil
         group { content() }
     }
 
-fun ContentMatcherBuilder<*>.unwrapAnnotation(elem: Map.Entry<String, Set<String>>) {
-    +"@"
-    link { +elem.key }
-    +"("
-    elem.value.forEach {
-        +("$it = ")
-        skipAllNotMatching()
+private fun ContentMatcherBuilder<*>.unwrapAnnotation(elem: Map.Entry<String, Set<String>>) {
+    group {
+        +"@"
+        link { +elem.key }
+        +"("
+        elem.value.forEach {
+            group {
+                +("$it = ")
+                skipAllNotMatching()
+            }
+        }
+        +")"
     }
-    +")"
 }
 
 data class ParamAttributes(
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index 8f20f942..693fffac 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -76,7 +76,13 @@ internal fun DProperty.asJava(isTopLevel: Boolean = false, relocateToClass: Stri
         type = type.asJava(), // TODO: check
         setter = null,
         getter = null, // Removing getters and setters as they will be available as functions
-        extra = if (isTopLevel) extra.plus(extra.mergeAdditionalModifiers(setOf(ExtraModifiers.JavaOnlyModifiers.Static))) else extra
+        extra = if (isTopLevel) extra +
+                extra.mergeAdditionalModifiers(
+                    sourceSets.map {
+                        it to setOf(ExtraModifiers.JavaOnlyModifiers.Static)
+                    }.toMap()
+                )
+        else extra
     )
 
 internal fun DProperty.javaAccessors(isTopLevel: Boolean = false, relocateToClass: String? = null): List<DFunction> =
@@ -95,7 +101,13 @@ internal fun DProperty.javaAccessors(isTopLevel: Boolean = false, relocateToClas
             },
             visibility = visibility.mapValues { JavaVisibility.Public },
             type = type.asJava(), // TODO: check
-            extra = if (isTopLevel) getter!!.extra.plus(getter!!.extra.mergeAdditionalModifiers(setOf(ExtraModifiers.JavaOnlyModifiers.Static))) else getter!!.extra
+            extra = if (isTopLevel) getter!!.extra +
+                    getter!!.extra.mergeAdditionalModifiers(
+                        sourceSets.map {
+                            it to setOf(ExtraModifiers.JavaOnlyModifiers.Static)
+                        }.toMap()
+                    )
+            else getter!!.extra
         ),
         setter?.copy(
             dri = if (relocateToClass.isNullOrBlank()) {
@@ -111,7 +123,12 @@ internal fun DProperty.javaAccessors(isTopLevel: Boolean = false, relocateToClas
             },
             visibility = visibility.mapValues { JavaVisibility.Public },
             type = type.asJava(), // TODO: check
-            extra = if (isTopLevel) setter!!.extra.plus(setter!!.extra.mergeAdditionalModifiers(setOf(ExtraModifiers.JavaOnlyModifiers.Static))) else setter!!.extra
+            extra = if (isTopLevel) setter!!.extra + setter!!.extra.mergeAdditionalModifiers(
+                sourceSets.map {
+                    it to setOf(ExtraModifiers.JavaOnlyModifiers.Static)
+                }.toMap()
+            )
+            else setter!!.extra
         )
     )
 
@@ -203,7 +220,9 @@ internal fun DObject.asJava(): DObject = copy(
                 receiver = null,
                 generics = emptyList(),
                 expectPresentInSet = expectPresentInSet,
-                extra = PropertyContainer.empty<DProperty>() + AdditionalModifiers(setOf(ExtraModifiers.JavaOnlyModifiers.Static))
+                extra = PropertyContainer.withAll(sourceSets.map {
+                    mapOf(it to setOf(ExtraModifiers.JavaOnlyModifiers.Static)).toAdditionalModifiers()
+                })
             ),
     classlikes = classlikes.map { it.asJava() },
     supertypes = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
@@ -248,7 +267,7 @@ internal fun ClassId.toDRI(dri: DRI?): DRI = DRI(
     target = PointingToDeclaration
 )
 
-private fun PropertyContainer<out Documentable>.mergeAdditionalModifiers(second: Set<ExtraModifiers>) =
+private fun PropertyContainer<out Documentable>.mergeAdditionalModifiers(second: SourceSetDependent<Set<ExtraModifiers>>) =
     this[AdditionalModifiers]?.squash(AdditionalModifiers(second)) ?: AdditionalModifiers(second)
 
 private fun AdditionalModifiers.squash(second: AdditionalModifiers) =
diff --git a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
index a55f9339..5c4985ac 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
@@ -41,7 +41,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
 
             if (c is DClass) {
                 platformText(c.modifier) { it.takeIf { it !in ignoredModifiers }?.name.orEmpty() + " " }
-                text(c.modifiers().toSignatureString())
+                platformText(c.modifiers()) { it.toSignatureString() }
             }
 
             when (c) {
@@ -71,7 +71,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
             annotationsBlock(p)
             platformText(p.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
             platformText(p.modifier) { it.name + " " }
-            text(p.modifiers().toSignatureString())
+            platformText(p.modifiers()) { it.toSignatureString() }
             signatureForProjection(p.type)
             text(nbsp.toString())
             link(p.name, p.dri)
@@ -82,7 +82,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
         group(styles = setOf(TextStyle.Block)) {
             annotationsBlock(f)
             platformText(f.modifier) { it.takeIf { it !in ignoredModifiers }?.name.orEmpty() + " " }
-            text(f.modifiers().toSignatureString())
+            platformText(f.modifiers()) { it.toSignatureString() }
             val returnType = f.type
             signatureForProjection(returnType)
             text(nbsp.toString())
@@ -92,7 +92,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
             }
             list(f.parameters, "(", ")") {
                 annotationsInline(it)
-                text(it.modifiers().toSignatureString())
+                platformText(it.modifiers()) { it.toSignatureString() }
                 signatureForProjection(it.type)
                 text(nbsp.toString())
                 link(it.name!!, it.dri)
diff --git a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureUtils.kt b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureUtils.kt
index e2f73bf9..b4245834 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureUtils.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureUtils.kt
@@ -28,6 +28,8 @@ object JavaSignatureUtils : JvmSignatureUtils {
         annotationsInlineWithIgnored(d, ignoredAnnotations, strategy, listBrackets, classExtension)
 
     override fun <T : Documentable> WithExtraProperties<T>.modifiers() =
-        extra[AdditionalModifiers]?.content?.filterIsInstance<ExtraModifiers.JavaOnlyModifiers>()?.toSet() ?: emptySet()
+        extra[AdditionalModifiers]?.content?.entries?.map {
+            it.key to it.value.filterIsInstance<ExtraModifiers.JavaOnlyModifiers>().toSet()
+        }?.toMap() ?: emptyMap()
 
 }
\ No newline at end of file
-- 
cgit 


From b67f44943bc80dedd70c4a9e120b9c6aec78ca72 Mon Sep 17 00:00:00 2001
From: Marcin Aman <maman@virtuslab.com>
Date: Thu, 2 Jul 2020 13:21:00 +0200
Subject: Draft for showing only first level of inheritance

---
 core/src/main/kotlin/links/DRI.kt                  |   5 +
 core/src/main/kotlin/model/Documentable.kt         |  11 +-
 .../kotlin/signatures/KotlinSignatureProvider.kt   |   2 +-
 .../InheritorsExtractorTransformer.kt              |   2 +-
 .../DefaultDescriptorToDocumentableTranslator.kt   |  66 ++++++----
 .../psi/DefaultPsiToDocumentableTranslator.kt      |  33 +++--
 plugins/base/src/test/kotlin/model/ClassesTest.kt  |  36 +++++-
 plugins/base/src/test/kotlin/model/JavaTest.kt     | 134 +++------------------
 .../javadoc/signatures/JavadocSignatureProvider.kt |   9 +-
 .../javadoc/src/main/resources/views/class.korte   |   2 +-
 .../kotlin/javadoc/location/JavadocLocationTest.kt |   3 +-
 .../kotlin/converters/KotlinToJavaConverter.kt     |   8 +-
 .../kotlin/signatures/JavaSignatureProvider.kt     |   8 +-
 13 files changed, 149 insertions(+), 170 deletions(-)

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/core/src/main/kotlin/links/DRI.kt b/core/src/main/kotlin/links/DRI.kt
index 3f6d886f..3892fc00 100644
--- a/core/src/main/kotlin/links/DRI.kt
+++ b/core/src/main/kotlin/links/DRI.kt
@@ -1,5 +1,9 @@
 package org.jetbrains.dokka.links
 
+import org.jetbrains.dokka.model.ClassKind
+import org.jetbrains.dokka.model.Documentable
+import org.jetbrains.dokka.model.WithSupertypes
+
 /**
  * [DRI] stands for DokkaResourceIdentifier
  */
@@ -100,3 +104,4 @@ fun DriTarget.nextTarget(): DriTarget = when (this) {
     else -> this
 }
 
+data class DriWithKind(val dri: DRI, val kind: ClassKind)
diff --git a/core/src/main/kotlin/model/Documentable.kt b/core/src/main/kotlin/model/Documentable.kt
index 21660f86..2c3e1323 100644
--- a/core/src/main/kotlin/model/Documentable.kt
+++ b/core/src/main/kotlin/model/Documentable.kt
@@ -2,6 +2,7 @@ package org.jetbrains.dokka.model
 
 import org.jetbrains.dokka.DokkaConfiguration.DokkaSourceSet
 import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.links.DriWithKind
 import org.jetbrains.dokka.model.doc.DocumentationNode
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.dokka.model.properties.WithExtraProperties
@@ -75,7 +76,7 @@ interface WithGenerics {
 }
 
 interface WithSupertypes {
-    val supertypes: SourceSetDependent<List<DRI>>
+    val supertypes: SourceSetDependent<List<DriWithKind>>
 }
 
 interface Callable : WithVisibility, WithType, WithAbstraction, WithExpectActual {
@@ -128,7 +129,7 @@ data class DClass(
     override val visibility: SourceSetDependent<Visibility>,
     override val companion: DObject?,
     override val generics: List<DTypeParameter>,
-    override val supertypes: SourceSetDependent<List<DRI>>,
+    override val supertypes: SourceSetDependent<List<DriWithKind>>,
     override val documentation: SourceSetDependent<DocumentationNode>,
     override val expectPresentInSet: DokkaSourceSet?,
     override val modifier: SourceSetDependent<Modifier>,
@@ -156,7 +157,7 @@ data class DEnum(
     override val visibility: SourceSetDependent<Visibility>,
     override val companion: DObject?,
     override val constructors: List<DFunction>,
-    override val supertypes: SourceSetDependent<List<DRI>>,
+    override val supertypes: SourceSetDependent<List<DriWithKind>>,
     override val sourceSets: Set<DokkaSourceSet>,
     override val extra: PropertyContainer<DEnum> = PropertyContainer.empty()
 ) : DClasslike(), WithCompanion, WithConstructors, WithSupertypes, WithExtraProperties<DEnum> {
@@ -217,7 +218,7 @@ data class DInterface(
     override val visibility: SourceSetDependent<Visibility>,
     override val companion: DObject?,
     override val generics: List<DTypeParameter>,
-    override val supertypes: SourceSetDependent<List<DRI>>,
+    override val supertypes: SourceSetDependent<List<DriWithKind>>,
     override val sourceSets: Set<DokkaSourceSet>,
     override val extra: PropertyContainer<DInterface> = PropertyContainer.empty()
 ) : DClasslike(), WithCompanion, WithGenerics, WithSupertypes, WithExtraProperties<DInterface> {
@@ -237,7 +238,7 @@ data class DObject(
     override val properties: List<DProperty>,
     override val classlikes: List<DClasslike>,
     override val visibility: SourceSetDependent<Visibility>,
-    override val supertypes: SourceSetDependent<List<DRI>>,
+    override val supertypes: SourceSetDependent<List<DriWithKind>>,
     override val sourceSets: Set<DokkaSourceSet>,
     override val extra: PropertyContainer<DObject> = PropertyContainer.empty()
 ) : DClasslike(), WithSupertypes, WithExtraProperties<DObject> {
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
index 14c130a2..37e0ea83 100644
--- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
+++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
@@ -184,7 +184,7 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
             if (c is WithSupertypes) {
                 c.supertypes.filter { it.key == sourceSet }.map { (s, dris) ->
                     list(dris, prefix = " : ", sourceSets = setOf(s)) {
-                        link(it.sureClassNames, it, sourceSets = setOf(s))
+                        link(it.dri.sureClassNames, it.dri, sourceSets = setOf(s))
                     }
                 }
             }
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/InheritorsExtractorTransformer.kt b/plugins/base/src/main/kotlin/transformers/documentables/InheritorsExtractorTransformer.kt
index f1bccd66..85256d51 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/InheritorsExtractorTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/InheritorsExtractorTransformer.kt
@@ -63,7 +63,7 @@ class InheritorsExtractorTransformer : DocumentableTransformer {
 
     private fun <T : Documentable> T.toInheritanceEntries() =
         (this as? WithSupertypes)?.let {
-            it.supertypes.map { (k, v) -> k to v.map { it to dri } }
+            it.supertypes.map { (k, v) -> k to v.map { it.dri to dri } }
         }.orEmpty()
 
 }
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index b0374014..9ca8cdde 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -1,7 +1,11 @@
 package org.jetbrains.dokka.base.translators.descriptors
 
 import org.jetbrains.dokka.DokkaConfiguration.DokkaSourceSet
-import org.jetbrains.dokka.analysis.*
+import org.jetbrains.dokka.analysis.DescriptorDocumentableSource
+import org.jetbrains.dokka.analysis.DokkaResolutionFacade
+import org.jetbrains.dokka.analysis.KotlinAnalysis
+import org.jetbrains.dokka.analysis.from
+import org.jetbrains.dokka.base.parsers.MarkdownParser
 import org.jetbrains.dokka.links.*
 import org.jetbrains.dokka.links.Callable
 import org.jetbrains.dokka.model.*
@@ -9,7 +13,6 @@ import org.jetbrains.dokka.model.Nullable
 import org.jetbrains.dokka.model.TypeConstructor
 import org.jetbrains.dokka.model.doc.*
 import org.jetbrains.dokka.model.properties.PropertyContainer
-import org.jetbrains.dokka.base.parsers.MarkdownParser
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.transformers.sources.SourceToDocumentableTranslator
 import org.jetbrains.dokka.utilities.DokkaLogger
@@ -33,7 +36,7 @@ import org.jetbrains.kotlin.resolve.constants.ConstantValue
 import org.jetbrains.kotlin.resolve.constants.KClassValue.Value.LocalClass
 import org.jetbrains.kotlin.resolve.constants.KClassValue.Value.NormalClass
 import org.jetbrains.kotlin.resolve.descriptorUtil.annotationClass
-import org.jetbrains.kotlin.resolve.descriptorUtil.getAllSuperclassesWithoutAny
+import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperClassNotAny
 import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperInterfaces
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
@@ -150,7 +153,7 @@ private class DokkaDescriptorVisitor(
             extra = PropertyContainer.withAll(
                 descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
                 descriptor.getAnnotations().toSourceSetDependent().toAnnotations(),
-                ImplementedInterfaces(info.interfaces.toSourceSetDependent())
+                ImplementedInterfaces(info.allImplementedInterfaces.toSourceSetDependent())
             )
         )
     }
@@ -177,7 +180,7 @@ private class DokkaDescriptorVisitor(
             extra = PropertyContainer.withAll(
                 descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
                 descriptor.getAnnotations().toSourceSetDependent().toAnnotations(),
-                ImplementedInterfaces(info.interfaces.toSourceSetDependent())
+                ImplementedInterfaces(info.allImplementedInterfaces.toSourceSetDependent())
             )
         )
     }
@@ -206,7 +209,7 @@ private class DokkaDescriptorVisitor(
             extra = PropertyContainer.withAll(
                 descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
                 descriptor.getAnnotations().toSourceSetDependent().toAnnotations(),
-                ImplementedInterfaces(info.interfaces.toSourceSetDependent())
+                ImplementedInterfaces(info.allImplementedInterfaces.toSourceSetDependent())
             )
         )
     }
@@ -290,7 +293,7 @@ private class DokkaDescriptorVisitor(
             extra = PropertyContainer.withAll(
                 descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
                 descriptor.getAnnotations().toSourceSetDependent().toAnnotations(),
-                ImplementedInterfaces(info.interfaces.toSourceSetDependent())
+                ImplementedInterfaces(info.allImplementedInterfaces.toSourceSetDependent())
             )
         )
     }
@@ -535,11 +538,6 @@ private class DokkaDescriptorVisitor(
             .filter { it is ClassDescriptor && it.kind != ClassKind.ENUM_ENTRY }
             .map { visitClassDescriptor(it as ClassDescriptor, parent) }
 
-    private fun MemberScope.packages(parent: DRIWithPlatformInfo): List<DPackage> =
-        getContributedDescriptors(DescriptorKindFilter.PACKAGES) { true }
-            .filterIsInstance<PackageFragmentDescriptor>()
-            .map { visitPackageFragmentDescriptor(it, parent) }
-
     private fun MemberScope.typealiases(parent: DRIWithPlatformInfo, packageLevel: Boolean = false): List<DTypeAlias> =
         getContributedDescriptors(DescriptorKindFilter.TYPE_ALIASES, packageLevel)
             .filterIsInstance<TypeAliasDescriptor>()
@@ -556,15 +554,30 @@ private class DokkaDescriptorVisitor(
         getDocumentation()?.toSourceSetDependent() ?: emptyMap()
 
     private fun ClassDescriptor.resolveClassDescriptionData(): ClassInfo {
-        val interfaces = hashSetOf<DRI>()
-        fun processSuperClasses(supers: List<ClassDescriptor>) {
-            supers.forEach {
-                if(it.kind == ClassKind.INTERFACE) interfaces.add(DRI.from(it))
-                processSuperClasses(it.getSuperInterfaces() + it.getAllSuperclassesWithoutAny())
-            }
+        tailrec fun processSuperClasses(
+            inheritorClass: ClassDescriptor?,
+            interfaces: List<ClassDescriptor>,
+            level: Int = 0,
+            inheritanceTree: Set<InheritanceLevel> = emptySet()
+        ): Set<InheritanceLevel> {
+            if (inheritorClass == null && interfaces.isEmpty()) return inheritanceTree
+
+            val updatedTree = inheritanceTree + InheritanceLevel(
+                level,
+                inheritorClass?.let { DRI.from(it) },
+                interfaces.map { DRI.from(it) })
+            val superInterfacesFromClass = inheritorClass?.getSuperInterfaces().orEmpty()
+            return processSuperClasses(
+                inheritorClass = inheritorClass?.getSuperClassNotAny(),
+                interfaces = interfaces.flatMap { it.getSuperInterfaces() } + superInterfacesFromClass,
+                level = level + 1,
+                inheritanceTree = updatedTree
+            )
         }
-        processSuperClasses(getSuperInterfaces() + getAllSuperclassesWithoutAny())
-        return ClassInfo(getAllSuperclassesWithoutAny().map { DRI.from(it) }, interfaces.toList(), resolveDescriptorData())
+        return ClassInfo(
+            processSuperClasses(getSuperClassNotAny(), getSuperInterfaces()).sortedBy { it.level },
+            resolveDescriptorData()
+        )
     }
 
     private fun TypeParameterDescriptor.toTypeParameter() =
@@ -733,9 +746,16 @@ private class DokkaDescriptorVisitor(
 
     private fun ValueArgument.childrenAsText() = this.safeAs<KtValueArgument>()?.children?.map { it.text }.orEmpty()
 
-    private data class ClassInfo(val superclasses: List<DRI>, val interfaces: List<DRI>, val docs: SourceSetDependent<DocumentationNode>){
-        val supertypes: List<DRI>
-            get() = (superclasses + interfaces).distinct()
+    private data class InheritanceLevel(val level: Int, val superclass: DRI?, val interfaces: List<DRI>)
+
+    private data class ClassInfo(val inheritance: List<InheritanceLevel>, val docs: SourceSetDependent<DocumentationNode>){
+        val supertypes: List<DriWithKind>
+            get() = inheritance.firstOrNull { it.level == 0 }?.let {
+                    listOfNotNull(it.superclass?.let { DriWithKind(it, KotlinClassKindTypes.CLASS) }) + it.interfaces.map { DriWithKind(it, KotlinClassKindTypes.INTERFACE) }
+                }.orEmpty()
+
+        val allImplementedInterfaces: List<DRI>
+            get() = inheritance.flatMap { it.interfaces }.distinct()
     }
 
     private fun Visibility.toDokkaVisibility(): org.jetbrains.dokka.model.Visibility = when (this) {
diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
index d426d41b..91b24476 100644
--- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
@@ -12,6 +12,7 @@ import org.jetbrains.dokka.analysis.KotlinAnalysis
 import org.jetbrains.dokka.analysis.PsiDocumentableSource
 import org.jetbrains.dokka.analysis.from
 import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.links.DriWithKind
 import org.jetbrains.dokka.links.nextTarget
 import org.jetbrains.dokka.links.withClass
 import org.jetbrains.dokka.model.*
@@ -127,11 +128,23 @@ class DefaultPsiToDocumentableTranslator(
 
         fun parseClasslike(psi: PsiClass, parent: DRI): DClasslike = with(psi) {
             val dri = parent.withClass(name.toString())
-            val ancestorsSet = hashSetOf<Ancestor>()
+            val inheritanceTree = mutableListOf<AncestorLevel>()
             val superMethodsKeys = hashSetOf<Int>()
             val superMethods = mutableListOf<Pair<PsiMethod, DRI>>()
             methods.forEach { superMethodsKeys.add(it.hash) }
-            fun parseSupertypes(superTypes: Array<PsiClassType>) {
+            fun parseSupertypes(superTypes: Array<PsiClassType>, level: Int = 0) {
+                if(superTypes.isEmpty()) return
+                val parsedClasses = superTypes.filter { !it.shouldBeIgnored }.mapNotNull {
+                    it.resolve()?.let {
+                        when {
+                            it.isInterface -> DRI.from(it) to JavaClassKindTypes.INTERFACE
+                            else -> DRI.from(it) to JavaClassKindTypes.CLASS
+                        }
+                    }
+                }
+                val (classes, interfaces) = parsedClasses.partition { it.second == JavaClassKindTypes.CLASS }
+                inheritanceTree.add(AncestorLevel(level, classes.firstOrNull()?.first, interfaces.map { it.first }))
+
                 superTypes.forEach { type ->
                     (type as? PsiClassType)?.takeUnless { type.shouldBeIgnored }?.resolve()?.let {
                         val definedAt = DRI.from(it)
@@ -144,8 +157,7 @@ class DefaultPsiToDocumentableTranslator(
                                 superMethods.add(Pair(method, definedAt))
                             }
                         }
-                        ancestorsSet.add(Ancestor(DRI.from(it), it.isInterface))
-                        parseSupertypes(it.superTypes)
+                        parseSupertypes(it.superTypes, level + 1)
                     }
                 }
             }
@@ -157,9 +169,16 @@ class DefaultPsiToDocumentableTranslator(
             val source = PsiDocumentableSource(this).toSourceSetDependent()
             val classlikes = innerClasses.map { parseClasslike(it, dri) }
             val visibility = getVisibility().toSourceSetDependent()
-            val ancestors = ancestorsSet.toList().map { it.dri }.toSourceSetDependent()
+            val ancestors = inheritanceTree.filter { it.level == 0 }.flatMap {
+                listOfNotNull(it.superclass?.let {
+                    DriWithKind(
+                        dri = it,
+                        kind = JavaClassKindTypes.CLASS
+                    )
+                }) + it.interfaces.map { DriWithKind(dri = it, kind = JavaClassKindTypes.INTERFACE) }
+            }.toSourceSetDependent()
             val modifiers = getModifier().toSourceSetDependent()
-            val implementedInterfacesExtra = ImplementedInterfaces(ancestorsSet.filter { it.isInterface }.map { it.dri }.toList().toSourceSetDependent())
+            val implementedInterfacesExtra = ImplementedInterfaces(inheritanceTree.flatMap { it.interfaces }.distinct().toSourceSetDependent())
             return when {
                 isAnnotationType ->
                     DAnnotation(
@@ -457,5 +476,5 @@ class DefaultPsiToDocumentableTranslator(
             get() = getChildOfType<PsiJavaCodeReferenceElement>()?.resolve()
     }
 
-    private data class Ancestor(val dri: DRI, val isInterface: Boolean)
+    private data class AncestorLevel(val level: Int, val superclass: DRI?, val interfaces: List<DRI>)
 }
diff --git a/plugins/base/src/test/kotlin/model/ClassesTest.kt b/plugins/base/src/test/kotlin/model/ClassesTest.kt
index 979ea89b..5dc8812e 100644
--- a/plugins/base/src/test/kotlin/model/ClassesTest.kt
+++ b/plugins/base/src/test/kotlin/model/ClassesTest.kt
@@ -221,7 +221,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
                 with((this / "f").cast<DFunction>()) {
                     modifier.values.forEach { it equals Open }
                 }
-                D.supertypes.flatMap { it.component2() }.firstOrNull() equals C.dri
+                D.supertypes.flatMap { it.component2() }.firstOrNull()?.dri equals C.dri
             }
         }
     }
@@ -258,8 +258,8 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
                 modifier.values.forEach { it equals Final }
 
             }
-            D.supers.single() equals C.dri
-            E.supers.firstOrNull() equals D.dri
+            D.supers.single().dri equals C.dri
+            E.supers.single().dri equals D.dri
         }
     }
 
@@ -500,4 +500,34 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             }
         }
     }
+
+    @Test fun multipleClassInheritance() {
+        inlineModelTest(
+            """
+                | open class A { }
+                | open class B: A() { }
+                | class Tested : B() { }
+            """.trimIndent()
+        ) {
+            with((this / "classes" / "Tested").cast<DClass>()) {
+                supertypes.entries.single().value.map { it.dri.sureClassNames }.single() equals "B"
+            }
+        }
+    }
+
+    @Test fun multipleClassInheritanceWithInterface(){
+        inlineModelTest(
+            """
+               | open class A { }
+               | open class B: A() { }
+               | interface X { }
+               | interface Y : X { }
+               | class Tested : B(), Y { }
+            """.trimIndent()
+        ){
+            with((this / "classes" / "Tested").cast<DClass>()) {
+                supertypes.entries.single().value.map { it.dri.sureClassNames to it.kind }.sortedBy { it.first } equals listOf("B" to KotlinClassKindTypes.CLASS, "Y" to KotlinClassKindTypes.INTERFACE)
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/plugins/base/src/test/kotlin/model/JavaTest.kt b/plugins/base/src/test/kotlin/model/JavaTest.kt
index 4cad784b..1f042304 100644
--- a/plugins/base/src/test/kotlin/model/JavaTest.kt
+++ b/plugins/base/src/test/kotlin/model/JavaTest.kt
@@ -54,38 +54,19 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
         }
     }
 
-    //@Test fun function() {
-    //        verifyJavaPackageMember("testdata/java/member.java", defaultModelConfig) { cls ->
-    //            assertEquals("Test", cls.name)
-    //            assertEquals(NodeKind.Class, cls.kind)
-    //            with(cls.members(NodeKind.Function).single()) {
-    //                assertEquals("fn", name)
-    //                assertEquals("Summary for Function", content.summary.toTestString().trimEnd())
-    //                assertEquals(3, content.sections.size)
-    //                with(content.sections[0]) {
-    //                    assertEquals("Parameters", tag)
-    //                    assertEquals("name", subjectName)
-    //                    assertEquals("render(Type:String,SUMMARY): is String parameter", toTestString())
-    //                }
-    //                with(content.sections[1]) {
-    //                    assertEquals("Parameters", tag)
-    //                    assertEquals("value", subjectName)
-    //                    assertEquals("render(Type:Int,SUMMARY): is int parameter", toTestString())
-    //                }
-    //                assertEquals("Unit", detail(NodeKind.Type).name)
-    //                assertTrue(members.none())
-    //                assertTrue(links.none())
-    //                with(details.first { it.name == "name" }) {
-    //                    assertEquals(NodeKind.Parameter, kind)
-    //                    assertEquals("String", detail(NodeKind.Type).name)
-    //                }
-    //                with(details.first { it.name == "value" }) {
-    //                    assertEquals(NodeKind.Parameter, kind)
-    //                    assertEquals("Int", detail(NodeKind.Type).name)
-    //                }
-    //            }
-    //        }
-    //    }
+    @Test fun multipleClassInheritanceWithInterface() {
+        inlineModelTest(
+            """
+            |interface Highest { }
+            |interface Lower extends Highest { }
+            |class Extendable { }
+            |class Tested extends Extendable implements Lower { }
+        """){
+            with((this / "java" / "Tested").cast<DClass>()) {
+                supertypes.entries.single().value.map { it.dri.sureClassNames to it.kind }.sortedBy { it.first } equals listOf("Extendable" to JavaClassKindTypes.CLASS, "Lower" to JavaClassKindTypes.INTERFACE)
+            }
+        }
+    }
 
     @Test // todo
     fun memberWithModifiers() {
@@ -107,19 +88,6 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
         }
     }
 
-    //    @Test fun memberWithModifiers() {
-    //        verifyJavaPackageMember("testdata/java/memberWithModifiers.java", defaultModelConfig) { cls ->
-    //            val modifiers = cls.details(NodeKind.Modifier).map { it.name }
-    //            assertTrue("abstract" in modifiers)
-    //            with(cls.members.single { it.name == "fn" }) {
-    //                assertEquals("protected", details[0].name)
-    //            }
-    //            with(cls.members.single { it.name == "openFn" }) {
-    //                assertEquals("open", details[1].name)
-    //            }
-    //        }
-    //    }
-
     @Test
     fun superClass() {
         inlineModelTest(
@@ -130,7 +98,7 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             with((this / "java" / "Foo").cast<DClass>()) {
                 val sups = listOf("Exception", "Cloneable")
                 assertTrue(
-                    sups.all { s -> supertypes.values.flatten().any { it.classNames == s } })
+                    sups.all { s -> supertypes.values.flatten().any { it.dri.classNames == s } })
                 "Foo must extend ${sups.joinToString(", ")}"
             }
         }
@@ -178,25 +146,6 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
         }
     }
 
-    //    @Test fun typeParameter() {
-    //        verifyJavaPackageMember("testdata/java/typeParameter.java", defaultModelConfig) { cls ->
-    //            val typeParameters = cls.details(NodeKind.TypeParameter)
-    //            with(typeParameters.single()) {
-    //                assertEquals("T", name)
-    //                with(detail(NodeKind.UpperBound)) {
-    //                    assertEquals("Comparable", name)
-    //                    assertEquals("T", detail(NodeKind.Type).name)
-    //                }
-    //            }
-    //            with(cls.members(NodeKind.Function).single()) {
-    //                val methodTypeParameters = details(NodeKind.TypeParameter)
-    //                with(methodTypeParameters.single()) {
-    //                    assertEquals("E", name)
-    //                }
-    //            }
-    //        }
-    //    }
-
     @Test
     fun constructors() {
         inlineModelTest(
@@ -290,19 +239,6 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
         }
     }
 
-    //    @Test fun fields() {
-    //        verifyJavaPackageMember("testdata/java/field.java", defaultModelConfig) { cls ->
-    //            val i = cls.members(NodeKind.Property).single { it.name == "i" }
-    //            assertEquals("Int", i.detail(NodeKind.Type).name)
-    //            assertTrue("var" in i.details(NodeKind.Modifier).map { it.name })
-    //
-    //            val s = cls.members(NodeKind.Property).single { it.name == "s" }
-    //            assertEquals("String", s.detail(NodeKind.Type).name)
-    //            assertFalse("var" in s.details(NodeKind.Modifier).map { it.name })
-    //            assertTrue("static" in s.details(NodeKind.Modifier).map { it.name })
-    //        }
-    //    }
-
     @Test
     fun staticMethod() {
         inlineModelTest(
@@ -321,25 +257,6 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
         }
     }
 
-    //    @Test fun staticMethod() { todo
-    //        verifyJavaPackageMember("testdata/java/staticMethod.java", defaultModelConfig) { cls ->
-    //            val m = cls.members(NodeKind.Function).single { it.name == "foo" }
-    //            assertTrue("static" in m.details(NodeKind.Modifier).map { it.name })
-    //        }
-    //    }
-    //
-    //    /**
-    //     *  `@suppress` not supported in Java!
-    //     *
-    //     *  [Proposed tags](https://www.oracle.com/technetwork/java/javase/documentation/proposed-tags-142378.html)
-    //     *  Proposed tag `@exclude` for it, but not supported yet
-    //     */
-    //    @Ignore("@suppress not supported in Java!") @Test fun suppressTag() {
-    //        verifyJavaPackageMember("testdata/java/suppressTag.java", defaultModelConfig) { cls ->
-    //            assertEquals(1, cls.members(NodeKind.Function).size)
-    //        }
-    //    }
-
     @Test
     fun annotatedAnnotation() {
         inlineModelTest(
@@ -367,13 +284,6 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
         }
     }
 
-    //    @Test fun deprecation() {
-    //        verifyJavaPackageMember("testdata/java/deprecation.java", defaultModelConfig) { cls ->
-    //            val fn = cls.members(NodeKind.Function).single()
-    //            assertEquals("This should no longer be used", fn.deprecation!!.content.toTestString())
-    //        }
-    //    }
-
     @Test
     fun javaLangObject() {
         inlineModelTest(
@@ -389,13 +299,6 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
         }
     }
 
-    //    @Test fun javaLangObject() {
-    //        verifyJavaPackageMember("testdata/java/javaLangObject.java", defaultModelConfig) { cls ->
-    //            val fn = cls.members(NodeKind.Function).single()
-    //            assertEquals("Any", fn.detail(NodeKind.Type).name)
-    //        }
-    //    }
-
     @Test
     fun enumValues() {
         inlineModelTest(
@@ -440,13 +343,4 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
             }
         }
     }
-
-    //    todo
-    //    @Test fun inheritorLinks() {
-    //        verifyJavaPackageMember("testdata/java/InheritorLinks.java", defaultModelConfig) { cls ->
-    //            val fooClass = cls.members.single { it.name == "Foo" }
-    //            val inheritors = fooClass.references(RefKind.Inheritor)
-    //            assertEquals(1, inheritors.size)
-    //        }
-    //    }
 }
diff --git a/plugins/javadoc/src/main/kotlin/javadoc/signatures/JavadocSignatureProvider.kt b/plugins/javadoc/src/main/kotlin/javadoc/signatures/JavadocSignatureProvider.kt
index 11db9fe1..c2483cc2 100644
--- a/plugins/javadoc/src/main/kotlin/javadoc/signatures/JavadocSignatureProvider.kt
+++ b/plugins/javadoc/src/main/kotlin/javadoc/signatures/JavadocSignatureProvider.kt
@@ -8,6 +8,7 @@ import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentCon
 import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
 import org.jetbrains.dokka.kotlinAsJava.signatures.JavaSignatureUtils
 import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.links.sureClassNames
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.dokka.pages.ContentKind
@@ -68,8 +69,12 @@ class JavadocSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLo
             supertypes {
                 if (c is WithSupertypes) {
                     c.supertypes.map { (p, dris) ->
-                        list(dris, sourceSets = setOf(p)) {
-                            link(it.fqName(), it, sourceSets = setOf(p))
+                        val (classes, interfaces) = dris.partition { it.kind == JavaClassKindTypes.CLASS }
+                        list(classes, prefix = " extends ", sourceSets = setOf(p)) {
+                            link(it.dri.sureClassNames, it.dri, sourceSets = setOf(p))
+                        }
+                        list(interfaces, prefix = " implements ", sourceSets = setOf(p)){
+                            link(it.dri.sureClassNames, it.dri, sourceSets = setOf(p))
                         }
                     }
                 }
diff --git a/plugins/javadoc/src/main/resources/views/class.korte b/plugins/javadoc/src/main/resources/views/class.korte
index 22793d69..62d90f7d 100644
--- a/plugins/javadoc/src/main/resources/views/class.korte
+++ b/plugins/javadoc/src/main/resources/views/class.korte
@@ -35,7 +35,7 @@
                     <pre>
 {% if signature.annotations != null %}{{ signature.annotations|raw }} {% endif %}
 {{ signature.modifiers }} <span class="typeNameLabel">{{ signature.signatureWithoutModifiers|raw }}</span>
-{% if signature.supertypes != null %}extends {{signature.supertypes|raw}} {% endif %}
+{% if signature.supertypes != null %}{{signature.supertypes|raw}} {% endif %}
                     </pre>
                     <div class="block">{{ classlikeDocumentation|raw }}</div>
                 </li>
diff --git a/plugins/javadoc/src/test/kotlin/javadoc/location/JavadocLocationTest.kt b/plugins/javadoc/src/test/kotlin/javadoc/location/JavadocLocationTest.kt
index 92620f78..d60e1070 100644
--- a/plugins/javadoc/src/test/kotlin/javadoc/location/JavadocLocationTest.kt
+++ b/plugins/javadoc/src/test/kotlin/javadoc/location/JavadocLocationTest.kt
@@ -39,6 +39,7 @@ class JavadocTest : AbstractCoreTest() {
             """
             |/jvmSrc/javadoc/Test.kt
             |package javadoc
+            |import java.io.Serializable
             |class Test() : Serializable, Cloneable 
         """.trimIndent(),
             config,
@@ -54,7 +55,7 @@ class JavadocTest : AbstractCoreTest() {
                 val testClass = rootPageNode.firstChildOfType<JavadocPackagePageNode>()
                     .firstChildOfType<JavadocClasslikePageNode>()
                 assert(
-                    "<a href=https://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable.html>java.lang.Cloneable</a>"
+                    " implements <a href=https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html>Serializable</a>, <a href=https://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable.html>Cloneable</a>"
                     == transformer.htmlForContentNode(testClass.signature.supertypes!!, null)
                 )
             }
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index 693fffac..1ca4ef51 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -167,7 +167,7 @@ internal fun DClass.asJava(): DClass = copy(
     properties = properties.map { it.asJava() },
     classlikes = classlikes.map { it.asJava() },
     generics = generics.map { it.asJava() },
-    supertypes = supertypes.mapValues { it.value.map { it.possiblyAsJava() } },
+    supertypes = supertypes.mapValues { it.value.map { it.copy(dri = it.dri.possiblyAsJava()) } },
     modifier = if (modifier.all { (_, v) -> v is KotlinModifier.Empty }) sourceSets.map { it to JavaModifier.Final }
         .toMap()
     else sourceSets.map { it to modifier.values.first() }.toMap()
@@ -195,7 +195,7 @@ internal fun DEnum.asJava(): DEnum = copy(
     },
     properties = properties.map { it.asJava() },
     classlikes = classlikes.map { it.asJava() },
-    supertypes = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
+    supertypes = supertypes.mapValues { it.value.map { it.copy(dri = it.dri.possiblyAsJava()) } }
 //    , entries = entries.map { it.asJava() }
 )
 
@@ -225,7 +225,7 @@ internal fun DObject.asJava(): DObject = copy(
                 })
             ),
     classlikes = classlikes.map { it.asJava() },
-    supertypes = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
+    supertypes = supertypes.mapValues { it.value.map { it.copy(dri = it.dri.possiblyAsJava()) } }
 )
 
 internal fun DInterface.asJava(): DInterface = copy(
@@ -235,7 +235,7 @@ internal fun DInterface.asJava(): DInterface = copy(
     properties = emptyList(),
     classlikes = classlikes.map { it.asJava() }, // TODO: public static final class DefaultImpls with impls for methods
     generics = generics.map { it.asJava() },
-    supertypes = supertypes.mapValues { it.value.map { it.possiblyAsJava() } }
+    supertypes = supertypes.mapValues { it.value.map { it.copy(dri = it.dri.possiblyAsJava()) } }
 )
 
 internal fun DAnnotation.asJava(): DAnnotation = copy(
diff --git a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
index ca817219..0e257945 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
@@ -77,8 +77,12 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
                 }
                 if (c is WithSupertypes) {
                     c.supertypes.map { (p, dris) ->
-                        list(dris, prefix = " extends ", sourceSets = setOf(p)) {
-                            link(it.sureClassNames, it, sourceSets = setOf(p))
+                        val (classes, interfaces) = dris.partition { it.kind == JavaClassKindTypes.CLASS }
+                        list(classes, prefix = " extends ", sourceSets = setOf(p)) {
+                            link(it.dri.sureClassNames, it.dri, sourceSets = setOf(p))
+                        }
+                        list(interfaces, prefix = " implements ", sourceSets = setOf(p)){
+                            link(it.dri.sureClassNames, it.dri, sourceSets = setOf(p))
                         }
                     }
                 }
-- 
cgit 


From 6377d964819f937bd4a7633488d69edc327542d8 Mon Sep 17 00:00:00 2001
From: Marcin Aman <maman@virtuslab.com>
Date: Mon, 6 Jul 2020 17:00:13 +0200
Subject: Java sources in Kotlin-As-Java plugin should have original property
 visibilites

---
 plugins/kotlin-as-java/build.gradle.kts            |   3 +
 .../kotlin/converters/KotlinToJavaConverter.kt     |  33 ++++---
 .../src/test/kotlin/KotlinAsJavaPluginTest.kt      | 107 +++++++++++++++++++++
 3 files changed, 127 insertions(+), 16 deletions(-)

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/plugins/kotlin-as-java/build.gradle.kts b/plugins/kotlin-as-java/build.gradle.kts
index bda876c1..bd08ab92 100644
--- a/plugins/kotlin-as-java/build.gradle.kts
+++ b/plugins/kotlin-as-java/build.gradle.kts
@@ -11,6 +11,9 @@ publishing {
 
 dependencies {
     implementation(project(":plugins:base"))
+    testImplementation(project(":plugins:base"))
+    testImplementation(project(":plugins:base:test-utils"))
+    testImplementation(project(":test-tools"))
 }
 
 configureBintrayPublication("kotlinAsJavaPlugin")
\ No newline at end of file
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index 1ca4ef51..24d99995 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -67,12 +67,8 @@ internal fun DProperty.asJava(isTopLevel: Boolean = false, relocateToClass: Stri
         } else {
             dri.withClass(relocateToClass)
         },
-        modifier = if (setter == null) {
-            sourceSets.map { it to JavaModifier.Final }.toMap()
-        } else {
-            sourceSets.map { it to JavaModifier.Empty }.toMap()
-        },
-        visibility = visibility.mapValues { JavaVisibility.Private },
+        modifier = javaModifierFromSetter(),
+        visibility = visibility.mapValues { it.value.propertyVisibilityAsJava() },
         type = type.asJava(), // TODO: check
         setter = null,
         getter = null, // Removing getters and setters as they will be available as functions
@@ -85,6 +81,15 @@ internal fun DProperty.asJava(isTopLevel: Boolean = false, relocateToClass: Stri
         else extra
     )
 
+internal fun DProperty.javaModifierFromSetter() =
+    modifier.mapValues {
+        when {
+            it.value is JavaModifier -> it.value
+            setter == null -> JavaModifier.Final
+            else -> JavaModifier.Empty
+        }
+    }
+
 internal fun DProperty.javaAccessors(isTopLevel: Boolean = false, relocateToClass: String? = null): List<DFunction> =
     listOfNotNull(
         getter?.copy(
@@ -94,11 +99,7 @@ internal fun DProperty.javaAccessors(isTopLevel: Boolean = false, relocateToClas
                 dri.withClass(relocateToClass)
             },
             name = "get" + name.capitalize(),
-            modifier = if (setter == null) {
-                sourceSets.map { it to JavaModifier.Final }.toMap()
-            } else {
-                sourceSets.map { it to JavaModifier.Empty }.toMap()
-            },
+            modifier = javaModifierFromSetter(),
             visibility = visibility.mapValues { JavaVisibility.Public },
             type = type.asJava(), // TODO: check
             extra = if (isTopLevel) getter!!.extra +
@@ -116,11 +117,7 @@ internal fun DProperty.javaAccessors(isTopLevel: Boolean = false, relocateToClas
                 dri.withClass(relocateToClass)
             },
             name = "set" + name.capitalize(),
-            modifier = if (setter == null) {
-                sourceSets.map { it to JavaModifier.Final }.toMap()
-            } else {
-                sourceSets.map { it to JavaModifier.Empty }.toMap()
-            },
+            modifier = javaModifierFromSetter(),
             visibility = visibility.mapValues { JavaVisibility.Public },
             type = type.asJava(), // TODO: check
             extra = if (isTopLevel) setter!!.extra + setter!!.extra.mergeAdditionalModifiers(
@@ -249,6 +246,10 @@ internal fun DParameter.asJava(): DParameter = copy(
     name = if (name.isNullOrBlank()) "\$self" else name
 )
 
+internal fun Visibility.propertyVisibilityAsJava(): Visibility =
+    if(this is JavaVisibility) this
+    else JavaVisibility.Private
+
 internal fun String.getAsPrimitive(): JvmPrimitiveType? = org.jetbrains.kotlin.builtins.PrimitiveType.values()
     .find { it.typeFqName.asString() == this }
     ?.let { JvmPrimitiveType.get(it) }
diff --git a/plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaPluginTest.kt b/plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaPluginTest.kt
index 96446201..ba513bf2 100644
--- a/plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaPluginTest.kt
+++ b/plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaPluginTest.kt
@@ -1,9 +1,11 @@
 package kotlinAsJavaPlugin
 
+import org.jetbrains.dokka.model.dfs
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest
 import org.jetbrains.kotlin.utils.addToStdlib.cast
 import org.junit.jupiter.api.Test
+import matchers.content.*
 
 class KotlinAsJavaPluginTest : AbstractCoreTest() {
 
@@ -130,6 +132,111 @@ class KotlinAsJavaPluginTest : AbstractCoreTest() {
         }
     }
 
+    @Test
+    fun `public kotlin properties should have a getter with same visibilities`(){
+        val configuration = dokkaConfiguration {
+            sourceSets {
+                sourceSet {
+                    sourceRoots = listOf("src/")
+                }
+            }
+        }
+        testInline(
+            """
+            |/src/main/kotlin/kotlinAsJavaPlugin/Test.kt
+            |package kotlinAsJavaPlugin
+            |
+            |class Test {
+            |   public val publicProperty: String = ""
+            |}
+        """,
+            configuration,
+            cleanupOutput = true
+        ) {
+            pagesTransformationStage = { rootPageNode ->
+                val propertyGetter = rootPageNode.dfs { it is MemberPageNode && it.name == "getPublicProperty" } as? MemberPageNode
+                assert(propertyGetter != null)
+                propertyGetter!!.content.assertNode {
+                    group {
+                        header(1) {
+                            +"getPublicProperty"
+                        }
+                    }
+                    divergentGroup {
+                        divergentInstance {
+                            divergent {
+                                group {
+                                    +"final"
+                                    group {
+                                        link {
+                                            +" String"
+                                        }
+                                    }
+                                    group {
+                                        link {
+                                            +"getPublicProperty"
+                                        }
+                                        +"()"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @Test
+    fun `java properties should keep its modifiers`(){
+        val configuration = dokkaConfiguration {
+            sourceSets {
+                sourceSet {
+                    sourceRoots = listOf("src/")
+                }
+            }
+        }
+        testInline(
+            """
+            |/src/main/kotlin/kotlinAsJavaPlugin/TestJ.java
+            |package kotlinAsJavaPlugin
+            |
+            |class TestJ {
+            |   public Int publicProperty = 1;
+            |}
+        """,
+            configuration,
+            cleanupOutput = true
+        ) {
+            pagesGenerationStage = { root ->
+                val testClass = root.dfs { it.name == "TestJ" } as? ClasslikePageNode
+                assert(testClass != null)
+                (testClass!!.content as ContentGroup).children.last().assertNode {
+                    group {
+                        header(2){
+                            +"Properties"
+                        }
+                        table {
+                            group {
+                                link {
+                                    +"publicProperty"
+                                }
+                                platformHinted {
+                                    group {
+                                        +"public Int"
+                                        link {
+                                            +"publicProperty"
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     private fun <T> Collection<T>.assertCount(n: Int, prefix: String = "") =
         assert(count() == n) { "${prefix}Expected $n, got ${count()}" }
 
-- 
cgit 


From 0104134b4891ccc97c27d4fee9846a9f74d46d0a Mon Sep 17 00:00:00 2001
From: Marcin Aman <maman@virtuslab.com>
Date: Mon, 13 Jul 2020 16:46:36 +0200
Subject: Kotlin as Java should translate class kinds

---
 .../kotlin/converters/KotlinToJavaConverter.kt     | 28 ++++++++++--
 .../src/test/kotlin/KotlinAsJavaPluginTest.kt      | 52 ++++++++++++++++++++++
 2 files changed, 76 insertions(+), 4 deletions(-)

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index 24d99995..e66266a2 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
+import java.lang.IllegalStateException
 
 private fun <T : WithExpectActual> List<T>.groupedByLocation() =
     map { it.sources to it }
@@ -164,7 +165,7 @@ internal fun DClass.asJava(): DClass = copy(
     properties = properties.map { it.asJava() },
     classlikes = classlikes.map { it.asJava() },
     generics = generics.map { it.asJava() },
-    supertypes = supertypes.mapValues { it.value.map { it.copy(dri = it.dri.possiblyAsJava()) } },
+    supertypes = supertypes.mapValues { it.value.map { it.asJava() } },
     modifier = if (modifier.all { (_, v) -> v is KotlinModifier.Empty }) sourceSets.map { it to JavaModifier.Final }
         .toMap()
     else sourceSets.map { it to modifier.values.first() }.toMap()
@@ -192,7 +193,7 @@ internal fun DEnum.asJava(): DEnum = copy(
     },
     properties = properties.map { it.asJava() },
     classlikes = classlikes.map { it.asJava() },
-    supertypes = supertypes.mapValues { it.value.map { it.copy(dri = it.dri.possiblyAsJava()) } }
+    supertypes = supertypes.mapValues { it.value.map { it.asJava() } }
 //    , entries = entries.map { it.asJava() }
 )
 
@@ -222,7 +223,7 @@ internal fun DObject.asJava(): DObject = copy(
                 })
             ),
     classlikes = classlikes.map { it.asJava() },
-    supertypes = supertypes.mapValues { it.value.map { it.copy(dri = it.dri.possiblyAsJava()) } }
+    supertypes = supertypes.mapValues { it.value.map { it.asJava() } }
 )
 
 internal fun DInterface.asJava(): DInterface = copy(
@@ -232,7 +233,7 @@ internal fun DInterface.asJava(): DInterface = copy(
     properties = emptyList(),
     classlikes = classlikes.map { it.asJava() }, // TODO: public static final class DefaultImpls with impls for methods
     generics = generics.map { it.asJava() },
-    supertypes = supertypes.mapValues { it.value.map { it.copy(dri = it.dri.possiblyAsJava()) } }
+    supertypes = supertypes.mapValues { it.value.map { it.asJava() } }
 )
 
 internal fun DAnnotation.asJava(): DAnnotation = copy(
@@ -268,6 +269,25 @@ internal fun ClassId.toDRI(dri: DRI?): DRI = DRI(
     target = PointingToDeclaration
 )
 
+internal fun DriWithKind.asJava(): DriWithKind =
+    DriWithKind(
+        dri = dri.possiblyAsJava(),
+        kind = kind.asJava()
+    )
+
+internal fun ClassKind.asJava(): ClassKind {
+    return when(this){
+        is JavaClassKindTypes -> this
+        KotlinClassKindTypes.CLASS -> JavaClassKindTypes.CLASS
+        KotlinClassKindTypes.INTERFACE -> JavaClassKindTypes.INTERFACE
+        KotlinClassKindTypes.ENUM_CLASS -> JavaClassKindTypes.ENUM_CLASS
+        KotlinClassKindTypes.ENUM_ENTRY -> JavaClassKindTypes.ENUM_ENTRY
+        KotlinClassKindTypes.ANNOTATION_CLASS -> JavaClassKindTypes.ANNOTATION_CLASS
+        KotlinClassKindTypes.OBJECT -> JavaClassKindTypes.CLASS
+        else -> throw IllegalStateException("Non exchaustive match while trying to convert $this to Java")
+    }
+}
+
 private fun PropertyContainer<out Documentable>.mergeAdditionalModifiers(second: SourceSetDependent<Set<ExtraModifiers>>) =
     this[AdditionalModifiers]?.squash(AdditionalModifiers(second)) ?: AdditionalModifiers(second)
 
diff --git a/plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaPluginTest.kt b/plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaPluginTest.kt
index ba513bf2..e12ec6cb 100644
--- a/plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaPluginTest.kt
+++ b/plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaPluginTest.kt
@@ -237,6 +237,58 @@ class KotlinAsJavaPluginTest : AbstractCoreTest() {
         }
     }
 
+    @Test
+    fun `koltin interfaces and classes should be split to extends and implements`(){
+        val configuration = dokkaConfiguration {
+            sourceSets {
+                sourceSet {
+                    sourceRoots = listOf("src/")
+                }
+            }
+        }
+        testInline(
+            """
+            |/src/main/kotlin/kotlinAsJavaPlugin/Test.kt
+            |package kotlinAsJavaPlugin
+            |
+            | open class A { }
+            | interface B
+            | class C : A(), B
+        """,
+            configuration,
+            cleanupOutput = true
+        ) {
+            pagesGenerationStage = { root ->
+                val testClass = root.dfs { it.name == "C" } as? ClasslikePageNode
+                assert(testClass != null)
+                testClass!!.content.assertNode {
+                    group {
+                        header(expectedLevel = 1) {
+                            +"C"
+                        }
+                        platformHinted {
+                            group {
+                                +"public final class"
+                                link {
+                                    +"C"
+                                }
+                                +" extends "
+                                link {
+                                    +"A"
+                                }
+                                +" implements "
+                                link {
+                                    +"B"
+                                }
+                            }
+                        }
+                    }
+                    skipAllNotMatching()
+                }
+            }
+        }
+    }
+
     private fun <T> Collection<T>.assertCount(n: Int, prefix: String = "") =
         assert(count() == n) { "${prefix}Expected $n, got ${count()}" }
 
-- 
cgit