aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/kotlin/transformers
diff options
context:
space:
mode:
authorKamil Doległo <kamilok1965@interia.pl>2020-01-24 14:41:33 +0100
committerPaweł Marks <Kordyjan@users.noreply.github.com>2020-01-31 15:27:26 +0100
commit0073c4c547dafaae5d465d4c410a52fd7fdc818d (patch)
tree3d98a7d1bebeb3ffaf269f1c41396d1fb3c3fea6 /core/src/main/kotlin/transformers
parent07e6778ab70122784e0c239c70838adbec66042d (diff)
downloaddokka-0073c4c547dafaae5d465d4c410a52fd7fdc818d.tar.gz
dokka-0073c4c547dafaae5d465d4c410a52fd7fdc818d.tar.bz2
dokka-0073c4c547dafaae5d465d4c410a52fd7fdc818d.zip
Cherry-pick 'analysis_rewrite_1.3.61'
Diffstat (limited to 'core/src/main/kotlin/transformers')
-rw-r--r--core/src/main/kotlin/transformers/documentation/DefaultDocumentationNodeMerger.kt3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/src/main/kotlin/transformers/documentation/DefaultDocumentationNodeMerger.kt b/core/src/main/kotlin/transformers/documentation/DefaultDocumentationNodeMerger.kt
index cac9d44c..04a5d954 100644
--- a/core/src/main/kotlin/transformers/documentation/DefaultDocumentationNodeMerger.kt
+++ b/core/src/main/kotlin/transformers/documentation/DefaultDocumentationNodeMerger.kt
@@ -3,12 +3,11 @@ package org.jetbrains.dokka.transformers.documentation
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<Module>, context: DokkaContext): Module {
if (!modules.all { it.name == modules.first().name })
- DokkaConsoleLogger.error("All module names need to be the same")
+ context.logger.error("All module names need to be the same")
return Module(
modules.first().name,
merge(