From a0a5fc5e362c38ee0592ce5332bbec02131ebbd2 Mon Sep 17 00:00:00 2001 From: Szymon Świstun Date: Tue, 17 Dec 2019 17:13:25 +0100 Subject: module name fix --- .../transformers/documentation/DefaultDocumentationNodeMerger.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'core/src/main/kotlin/transformers') diff --git a/core/src/main/kotlin/transformers/documentation/DefaultDocumentationNodeMerger.kt b/core/src/main/kotlin/transformers/documentation/DefaultDocumentationNodeMerger.kt index fe689c01..626038f5 100644 --- a/core/src/main/kotlin/transformers/documentation/DefaultDocumentationNodeMerger.kt +++ b/core/src/main/kotlin/transformers/documentation/DefaultDocumentationNodeMerger.kt @@ -1,18 +1,23 @@ package org.jetbrains.dokka.transformers.documentation +import com.intellij.openapi.diagnostic.logger import org.jetbrains.dokka.model.* import org.jetbrains.dokka.model.Function import org.jetbrains.dokka.plugability.DokkaContext +import org.jetbrains.dokka.utilities.DokkaConsoleLogger internal object DefaultDocumentationNodeMerger : DocumentationNodeMerger { - override fun invoke(modules: Collection, context: DokkaContext): Module = - Module( + override fun invoke(modules: Collection, context: DokkaContext): Module { + if (!modules.drop(1).all { it.name == modules.first().name }) + DokkaConsoleLogger.error("All module names need to be the same") + return Module( modules.first().name, merge( modules.flatMap { it.packages }, Package::mergeWith ) ) + } } private fun merge(elements: List, reducer: (T, T) -> T): List = -- cgit