aboutsummaryrefslogtreecommitdiff
path: root/plugins/base/src/main/kotlin/transformers/documentables
diff options
context:
space:
mode:
authorMarcin Aman <marcin.aman@gmail.com>2021-08-27 13:45:27 +0200
committerMarcin Aman <marcin.aman@gmail.com>2021-08-27 13:45:27 +0200
commit459a0005824de412ff7d4472c1eb4d6fb7c2a7cc (patch)
tree0ccdbf1d2b5b7e3ad54f70df9284d63a29f058f5 /plugins/base/src/main/kotlin/transformers/documentables
parent8e1848edfa24acb6b12fad067a6cedbb7be0426b (diff)
downloaddokka-459a0005824de412ff7d4472c1eb4d6fb7c2a7cc.tar.gz
dokka-459a0005824de412ff7d4472c1eb4d6fb7c2a7cc.tar.bz2
dokka-459a0005824de412ff7d4472c1eb4d6fb7c2a7cc.zip
Restore language level to 1.4
Diffstat (limited to 'plugins/base/src/main/kotlin/transformers/documentables')
-rw-r--r--plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
index 8cee22b2..61a7a6a2 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
@@ -7,6 +7,7 @@ import org.jetbrains.dokka.model.properties.MergeStrategy
import org.jetbrains.dokka.model.properties.mergeExtras
import org.jetbrains.dokka.plugability.DokkaContext
import org.jetbrains.dokka.transformers.documentation.DocumentableMerger
+import org.jetbrains.kotlin.util.firstNotNullResult
internal class DefaultDocumentableMerger(val context: DokkaContext) : DocumentableMerger {
private val dependencyInfo = context.getDependencyInfo()
@@ -20,7 +21,7 @@ internal class DefaultDocumentableMerger(val context: DokkaContext) : Documentab
list.flatMap { it.packages }
) { pck1, pck2 -> pck1.mergeWith(pck2) },
documentation = list.map { it.documentation }.flatMap { it.entries }.associate { (k, v) -> k to v },
- expectPresentInSet = list.firstNotNullOfOrNull { it.expectPresentInSet },
+ expectPresentInSet = list.firstNotNullResult { it.expectPresentInSet },
sourceSets = list.flatMap { it.sourceSets }.toSet()
).mergeExtras(left, right)
}