Small adjustments to the new model

6 files changed, 10 insertions, 9 deletions

diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
index 485aca4c..64363078 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
@@ -115,7 +115,7 @@ fun Property.mergeWith(other: Property): Property = copy(
     actual = actual.mergeWith(other.actual),
     visibility = visibility.mergeWith(other.visibility),
     platformData = (platformData + other.platformData).distinct(),
-    getter = getter.mergeWith(other.getter),
+    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
 ).mergeExtras(this, other)
 
diff --git a/plugins/base/src/main/kotlin/transformers/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/transformers/psi/DefaultPsiToDocumentableTranslator.kt
index da06e621..1001ffb3 100644
--- a/plugins/base/src/main/kotlin/transformers/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/transformers/psi/DefaultPsiToDocumentableTranslator.kt
@@ -238,7 +238,6 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator {
 
         private fun PsiModifierListOwner.getModifier() = when {
             hasModifier(JvmModifier.ABSTRACT) -> WithAbstraction.Modifier.Abstract
-            hasModifier(JvmModifier.STATIC) -> WithAbstraction.Modifier.Static
             hasModifier(JvmModifier.FINAL) -> WithAbstraction.Modifier.Final
             else -> null
         }
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index 2cd0eca8..895690c2 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -32,7 +32,7 @@ class DefaultDescriptorToDocumentableTranslator(
         moduleName: String,
         packageFragments: Iterable<PackageFragmentDescriptor>,
         platformData: PlatformData
-    ) = DokkaDescriptorVisitor(platformData, context.platforms[platformData]?.facade!!).run {
+    ) = DokkaDescriptorVisitor(platformData, context.platforms.getValue(platformData).facade).run {
         packageFragments.map {
             visitPackageFragmentDescriptor(
                 it,
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index 03a28ceb..4da35099 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -74,7 +74,7 @@ open class DefaultPageCreator(
 
     protected open fun contentForClasslike(c: Classlike) = contentBuilder.contentFor(c) {
         when (c) { // TODO this when will be removed when signature generation is moved to utils
-            is Class -> header(1) { text(c.name) }
+            is Class, is Object, is Annotation, is Interface -> header(1) { text(c.name ?: "<>") }
             is Enum -> {
                 header(1) { text("enum ${c.name}") }
                 block("Entries", 2, ContentKind.Properties, c.entries, c.platformData.toSet()) { entry ->
@@ -124,3 +124,7 @@ open class DefaultPageCreator(
 
     protected open fun TagWrapper.toHeaderString() = this.javaClass.toGenericString().split('.').last()
 }
+
+class A {
+    companion object F {}
+}
\ No newline at end of file
diff --git a/plugins/base/src/test/kotlin/markdown/KDocTest.kt b/plugins/base/src/test/kotlin/markdown/KDocTest.kt
index c58c4e30..5099c46f 100644
--- a/plugins/base/src/test/kotlin/markdown/KDocTest.kt
+++ b/plugins/base/src/test/kotlin/markdown/KDocTest.kt
@@ -27,9 +27,8 @@ open class KDocTest : AbstractCoreTest() {
 
     private fun actualDocumentationNode(modulePageNode: ModulePageNode) =
         (modulePageNode.documentable?.children?.first() as Package)
-            .classlikes.first()
-            .platformInfo.first()
-            .documentationNode
+            .classlikes.single()
+            .documentation.values.single()
 
 
     protected fun executeTest(kdoc: String, expectedDocumentationNode: DocumentationNode) {
diff --git a/plugins/base/src/test/kotlin/multiplatform/BasicMultiplatformTest.kt b/plugins/base/src/test/kotlin/multiplatform/BasicMultiplatformTest.kt
index f9431bbb..ae5b4e06 100644
--- a/plugins/base/src/test/kotlin/multiplatform/BasicMultiplatformTest.kt
+++ b/plugins/base/src/test/kotlin/multiplatform/BasicMultiplatformTest.kt
@@ -47,8 +47,7 @@ class BasicMultiplatformTest : AbstractCoreTest() {
             configuration
         ) {
             pagesGenerationStage = {
-                println(it.dri)
-                assertEquals(7, it.parentMap.size)
+                assertEquals(6, it.parentMap.size)
             }
         }
     }