Adding separate pages for properties

plugins/base/src/main/kotlin/resolvers/external/DefaultExternalLocationProvider.kt

@@ -26,7 +26,7 @@ open class DefaultExternalLocationProvider(
         val classLink = (listOfNotNull(packageName) + classNamesChecked.split('.'))
             .joinToString("/", transform = ::identifierToFilename)
 
-        val callableChecked = callable ?: return "$docURL$classLink/index$extension"
-        return "$docURL$classLink/" + identifierToFilename(callableChecked.name) + extension
+        val fileName = callable?.let { identifierToFilename(it.name) } ?: "index"
+        return "$docURL$classLink/$fileName$extension"
     }
 }

plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt

@@ -36,15 +36,15 @@ open class DefaultPageCreator(
 
     open fun pageForPackage(p: DPackage): PackagePageNode = PackagePageNode(
         p.name, contentForPackage(p), setOf(p.dri), p,
-        p.classlikes.renameClashingClasslikes().map(::pageForClasslike) +
-                p.functions.map(::pageForFunction)
+        p.classlikes.renameClashingDocumentable().map(::pageForClasslike) +
+                p.functions.renameClashingDocumentable().map(::pageForFunction) + p.properties.mapNotNull(::pageForProperty)
     )
 
     open fun pageForEnumEntry(e: DEnumEntry): ClasslikePageNode =
         ClasslikePageNode(
             e.name, contentForEnumEntry(e), setOf(e.dri), e,
-            e.classlikes.renameClashingClasslikes().map(::pageForClasslike) +
-                    e.filteredFunctions.map(::pageForFunction)
+            e.classlikes.renameClashingDocumentable().map(::pageForClasslike) +
+                    e.filteredFunctions.renameClashingDocumentable().map(::pageForFunction)
         )
 
     open fun pageForClasslike(c: DClasslike): ClasslikePageNode {
@@ -53,27 +53,38 @@ open class DefaultPageCreator(
         return ClasslikePageNode(
             c.name.orEmpty(), contentForClasslike(c), setOf(c.dri), c,
             constructors.map(::pageForFunction) +
-                    c.classlikes.renameClashingClasslikes().map(::pageForClasslike) +
-                    c.filteredFunctions.map(::pageForFunction) +
+                    c.classlikes.renameClashingDocumentable().map(::pageForClasslike) +
+                    c.filteredFunctions.renameClashingDocumentable().map(::pageForFunction) +
+                    c.properties.renameClashingDocumentable().mapNotNull(::pageForProperty) +
                     if (c is DEnum) c.entries.map(::pageForEnumEntry) else emptyList()
+
         )
     }
 
-    private fun List<DClasslike>.renameClashingClasslikes(): List<DClasslike> = groupBy { it.dri }.values.flatMap { classlikes ->
-        if (classlikes.size == 1) classlikes else classlikes.map { classlike ->
-            fun ClashingDriIdentifier?.toName() = this?.value?.joinToString(", ", "(", ")") { it.displayName } ?: ""
-            when(classlike) {
-                is DClass -> classlike.copy(name = classlike.name + classlike.extra[ClashingDriIdentifier]?.toName())
-                is DObject -> classlike.copy(name = classlike.name.orEmpty() + classlike.extra[ClashingDriIdentifier]?.toName())
-                is DAnnotation -> classlike.copy(name = classlike.name + classlike.extra[ClashingDriIdentifier]?.toName())
-                is DInterface -> classlike.copy(name = classlike.name + classlike.extra[ClashingDriIdentifier]?.toName())
-                is DEnum -> classlike.copy(name = classlike.name + classlike.extra[ClashingDriIdentifier]?.toName())
-            }
+    private fun <T> T.toClashedName() where T: Documentable, T: WithExtraProperties<T> =
+        name.orEmpty() + (extra[ClashingDriIdentifier]?.value?.joinToString(", ", "(", ")") { it.displayName } ?: "")
+
+    private fun <T> List<T>.renameClashingDocumentable(): List<T> where T: Documentable =
+        groupBy { it.dri }.values.flatMap { elements ->
+        if (elements.size == 1) elements else elements.mapNotNull { element ->
+            when(element) {
+                is DClass -> element.copy(name = element.toClashedName())
+                is DObject -> element.copy(name = element.toClashedName())
+                is DAnnotation -> element.copy(name = element.toClashedName())
+                is DInterface -> element.copy(name = element.toClashedName())
+                is DEnum -> element.copy(name = element.toClashedName())
+                is DFunction -> element.copy(name = element.toClashedName())
+                is DProperty -> element.copy(name = element.toClashedName())
+                is DTypeAlias -> element.copy(name = element.toClashedName())
+                else -> null
+            } as? T?
         }
     }
 
     open fun pageForFunction(f: DFunction) = MemberPageNode(f.name, contentForFunction(f), setOf(f.dri), f)
 
+    open fun pageForProperty(p: DProperty): MemberPageNode? = MemberPageNode(p.name, contentForProperty(p), setOf(p.dri), p)
+
     private val WithScope.filteredFunctions: List<DFunction>
         get() = functions.mapNotNull { function ->
             function.takeIf {
@@ -476,6 +487,8 @@ open class DefaultPageCreator(
 
     protected open fun contentForFunction(f: DFunction) = contentForMember(f)
 
+    protected open fun contentForProperty(p: DProperty) = contentForMember(p)
+
     protected open fun contentForMember(d: Documentable) = contentBuilder.contentFor(d) {
         group(kind = ContentKind.Cover) {
             cover(d.name.orEmpty())

plugins/base/src/test/kotlin/basic/DokkaBasicTests.kt

@@ -5,6 +5,7 @@ import org.jetbrains.dokka.pages.ModulePageNode
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest
+import kotlin.test.assertEquals
 
 class DokkaBasicTests : AbstractCoreTest() {
 
@@ -32,7 +33,7 @@ class DokkaBasicTests : AbstractCoreTest() {
         ) {
             pagesGenerationStage = {
                 val root = it as ModulePageNode
-                assertTrue(root.getClasslikeToMemberMap().filterKeys { it.name == "Test" }.entries.firstOrNull()?.value?.size == 2)
+                assertEquals(3, root.getClasslikeToMemberMap().filterKeys { it.name == "Test" }.entries.firstOrNull()?.value?.size)
             }
         }
     }

plugins/base/src/test/kotlin/enums/EnumsTest.kt

@@ -6,6 +6,7 @@ import org.jetbrains.dokka.model.DEnum
 import org.jetbrains.dokka.model.dfs
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest
+import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
 
@@ -202,7 +203,7 @@ class EnumsTest : AbstractCoreTest() {
             configuration
         ) {
             pagesTransformationStage = { m ->
-                val entryNode = m.children.first { it.name == "enums" }.children.first { it.name == "Test" }.children.first() as ClasslikePageNode
+                val entryNode = m.children.first { it.name == "enums" }.children.first { it.name == "Test" }.children.firstIsInstance<ClasslikePageNode>()
                 val signature = (entryNode.content as ContentGroup).dfs { it is ContentGroup && it.dci.toString() == "[enums/Test.E1///PointingToDeclaration/][Cover]" } as ContentGroup
 
                 signature.assertNode {

plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt

@@ -43,7 +43,7 @@ class FunctionalTypeConstructorsSignatureTest : AbstractCoreTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/example.html").firstSignature().match(
+                writerPlugin.writer.renderedContent("root/example/index.html").firstSignature().match(
                     "val ", A("nF"), ": (", A("Int"), ") -> ", A("String"), Span()
                 )
             }
@@ -61,7 +61,7 @@ class FunctionalTypeConstructorsSignatureTest : AbstractCoreTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/example.html").firstSignature().match(
+                writerPlugin.writer.renderedContent("root/example/index.html").firstSignature().match(
                     "val ", A("nF"), ": (", A("Int"), ") -> ", A("String"), Span()
                 )
             }
@@ -79,7 +79,7 @@ class FunctionalTypeConstructorsSignatureTest : AbstractCoreTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/example.html").firstSignature().match(
+                writerPlugin.writer.renderedContent("root/example/index.html").firstSignature().match(
                     "val ", A("nF"), ": ", A("Boolean"), ".(", A("Int"), ") -> ", A("String"), Span()
                 )
             }
@@ -97,7 +97,7 @@ class FunctionalTypeConstructorsSignatureTest : AbstractCoreTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/example.html").firstSignature().match(
+                writerPlugin.writer.renderedContent("root/example/index.html").firstSignature().match(
                     "val ", A("nF"), ": (param: ", A("Int"), ") -> ", A("String"), Span()
                 )
             }
@@ -116,7 +116,7 @@ class FunctionalTypeConstructorsSignatureTest : AbstractCoreTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/example.html").firstSignature().match(
+                writerPlugin.writer.renderedContent("root/example/index.html").firstSignature().match(
                     "val ", A("nF"), ": suspend (", A("Int"), ") -> ", A("String"), Span()
                 )
             }
@@ -134,7 +134,7 @@ class FunctionalTypeConstructorsSignatureTest : AbstractCoreTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/example.html").firstSignature().match(
+                writerPlugin.writer.renderedContent("root/example/index.html").firstSignature().match(
                     "val ", A("nF"), ": suspend (", A("Int"), ") -> ", A("String"), Span()
                 )
             }
@@ -152,7 +152,7 @@ class FunctionalTypeConstructorsSignatureTest : AbstractCoreTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/example.html").firstSignature().match(
+                writerPlugin.writer.renderedContent("root/example/index.html").firstSignature().match(
                     "val ", A("nF"), ": suspend ", A("Boolean"), ".(", A("Int"), ") -> ", A("String"), Span()
                 )
             }
@@ -170,7 +170,7 @@ class FunctionalTypeConstructorsSignatureTest : AbstractCoreTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/example.html").firstSignature().match(
+                writerPlugin.writer.renderedContent("root/example/index.html").firstSignature().match(
                     "val ", A("nF"), ": suspend (param: ", A("Int"), ") -> ", A("String"), Span()
                 )
             }
@@ -189,7 +189,7 @@ class FunctionalTypeConstructorsSignatureTest : AbstractCoreTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/example.html").firstSignature().match(
+                writerPlugin.writer.renderedContent("root/example/index.html").firstSignature().match(
                     "val ",
                     A("nF"),
                     ": suspend (param1: suspend",

plugins/base/src/test/kotlin/signatures/SignatureTest.kt

@@ -606,7 +606,7 @@ class SignatureTest : AbstractCoreTest() {
             pluginOverrides = listOf(writerPlugin)
         ) {
             renderingStage = { _, _ ->
-                writerPlugin.writer.renderedContent("root/example.html").firstSignature().match(
+                writerPlugin.writer.renderedContent("root/example/index.html").firstSignature().match(
                     "const val ", A("simpleVal"), ": ", A("Int"), " = 1", Span()
                 )
             }

plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/JavadocPlugin.kt

@@ -35,7 +35,7 @@ class JavadocPlugin : DokkaPlugin() {
                 dokkaBasePlugin.querySingle { signatureProvider },
                 context.logger
             )
-        } override dokkaBasePlugin.documentableToPageTranslator
+        } override kotinAsJavaPlugin.kotlinAsJavaDocumentableToPageTranslator
     }
 
     val documentableSourceSetFilter by extending {

plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPlugin.kt

@@ -4,10 +4,11 @@ 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.kotlinAsJava.translators.KotlinAsJavaDocumentableToPageTranslator
 import org.jetbrains.dokka.plugability.DokkaPlugin
 
 class KotlinAsJavaPlugin : DokkaPlugin() {
-    val kotlinAsJavaDocumentableToPageTranslator by extending {
+    val kotlinAsJavaDocumentableTransformer by extending {
         CoreExtensions.documentableTransformer with KotlinAsJavaDocumentableTransformer()
     }
     val javaSignatureProvider by extending {
@@ -16,4 +17,14 @@ class KotlinAsJavaPlugin : DokkaPlugin() {
             JavaSignatureProvider(ctx.single(dokkaBasePlugin.commentsToContentConverter), ctx.logger)
         } override dokkaBasePlugin.kotlinSignatureProvider
     }
+    val kotlinAsJavaDocumentableToPageTranslator by extending {
+        val dokkaBasePlugin = plugin<DokkaBase>()
+        CoreExtensions.documentableToPageTranslator providing { ctx ->
+            KotlinAsJavaDocumentableToPageTranslator(
+                ctx.single(dokkaBasePlugin.commentsToContentConverter),
+                ctx.single(dokkaBasePlugin.signatureProvider),
+                ctx.logger
+            )
+        } override dokkaBasePlugin.documentableToPageTranslator
+    }
 }

plugins/kotlin-as-java/src/main/kotlin/translators/KotlinAsJavaDocumentableToPageTranslator.kt

@@ -0,0 +1,17 @@
+package org.jetbrains.dokka.kotlinAsJava.translators
+
+import org.jetbrains.dokka.base.signatures.SignatureProvider
+import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
+import org.jetbrains.dokka.transformers.documentation.DocumentableToPageTranslator
+import org.jetbrains.dokka.model.DModule
+import org.jetbrains.dokka.pages.ModulePageNode
+import org.jetbrains.dokka.utilities.DokkaLogger
+
+class KotlinAsJavaDocumentableToPageTranslator(
+    private val commentsToContentConverter: CommentsToContentConverter,
+    private val signatureProvider: SignatureProvider,
+    private val logger: DokkaLogger
+) : DocumentableToPageTranslator {
+    override fun invoke(module: DModule): ModulePageNode =
+        KotlinAsJavaPageCreator(commentsToContentConverter, signatureProvider, logger).pageForModule(module)
+}

plugins/kotlin-as-java/src/main/kotlin/translators/KotlinAsJavaPageCreator.kt

@@ -0,0 +1,16 @@
+package org.jetbrains.dokka.kotlinAsJava.translators
+
+import org.jetbrains.dokka.base.signatures.SignatureProvider
+import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
+import org.jetbrains.dokka.base.translators.documentables.DefaultPageCreator
+import org.jetbrains.dokka.model.DProperty
+import org.jetbrains.dokka.pages.MemberPageNode
+import org.jetbrains.dokka.utilities.DokkaLogger
+
+class KotlinAsJavaPageCreator(
+    commentsToContentConverter: CommentsToContentConverter,
+    signatureProvider: SignatureProvider,
+    logger: DokkaLogger
+) : DefaultPageCreator(commentsToContentConverter, signatureProvider, logger) {
+    override fun pageForProperty(p: DProperty): MemberPageNode? = null
+}