From a1f8efc30b4421ce371b02b747bbeac24fafd7ba Mon Sep 17 00:00:00 2001
From: Andrzej Ratajczak <andrzej.ratajczak98@gmail.com>
Date: Thu, 25 Jun 2020 14:22:51 +0200
Subject: Changed way of merging documentables to avoid exception on merging
 documentables of different types. Minor javadoc fixes. Changed constructor
 names. Add handling same name pages clash for different platforms

---
 core/src/main/kotlin/DokkaGenerator.kt                                | 2 +-
 core/src/main/kotlin/model/documentableProperties.kt                  | 4 ++++
 core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'core')

diff --git a/core/src/main/kotlin/DokkaGenerator.kt b/core/src/main/kotlin/DokkaGenerator.kt
index 671d0725..6f42b259 100644
--- a/core/src/main/kotlin/DokkaGenerator.kt
+++ b/core/src/main/kotlin/DokkaGenerator.kt
@@ -85,7 +85,7 @@ class DokkaGenerator(
     fun mergeDocumentationModels(
         modulesFromPlatforms: List<DModule>,
         context: DokkaContext
-    ) = context.single(CoreExtensions.documentableMerger).invoke(modulesFromPlatforms, context)
+    ) = context.single(CoreExtensions.documentableMerger).invoke(modulesFromPlatforms)
 
     fun transformDocumentationModelAfterMerge(
         documentationModel: DModule,
diff --git a/core/src/main/kotlin/model/documentableProperties.kt b/core/src/main/kotlin/model/documentableProperties.kt
index 4eb36599..823b88a0 100644
--- a/core/src/main/kotlin/model/documentableProperties.kt
+++ b/core/src/main/kotlin/model/documentableProperties.kt
@@ -24,4 +24,8 @@ data class ImplementedInterfaces(val interfaces: SourceSetDependent<List<TypeCon
     }
 
     override val key: ExtraProperty.Key<Documentable, *> = ImplementedInterfaces
+}
+
+object IsExpectActual: ExtraProperty<WithExpectActual>, ExtraProperty.Key<WithExpectActual, IsExpectActual> {
+    override val key: ExtraProperty.Key<WithExpectActual, IsExpectActual> = this
 }
\ 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 c8ae9c02..81c1f470 100644
--- a/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt
+++ b/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt
@@ -4,5 +4,5 @@ import org.jetbrains.dokka.model.DModule
 import org.jetbrains.dokka.plugability.DokkaContext
 
 interface DocumentableMerger {
-    operator fun invoke(modules: Collection<DModule>, context: DokkaContext): DModule
+    operator fun invoke(modules: Collection<DModule>): DModule
 }
\ No newline at end of file
-- 
cgit