From f94bbdc3bfa66bf2d485007739ce19a3befda98c Mon Sep 17 00:00:00 2001 From: Szymon Świstun Date: Wed, 4 Mar 2020 17:46:19 +0100 Subject: Combine multiple applyIf --- core/src/main/kotlin/model/Documentable.kt | 5 ----- core/src/main/kotlin/plugability/extensions.kt | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/core/src/main/kotlin/model/Documentable.kt b/core/src/main/kotlin/model/Documentable.kt index e379adb9..22930bf2 100644 --- a/core/src/main/kotlin/model/Documentable.kt +++ b/core/src/main/kotlin/model/Documentable.kt @@ -343,11 +343,6 @@ enum class ExtraModifiers { OVERRIDE, DATA, CONST, DYNAMIC, EXTERNAL, INNER, LATEINIT, OPERATOR, TAILREC, VARARG } -enum class ExtraModifiers { - STATIC, INLINE, INFIX, SUSPEND, REIFIED, CROSSINLINE, NOINLINE, - OVERRIDE, DATA, CONST, DYNAMIC, EXTERNAL, INNER, LATEINIT, OPERATOR, TAILREC, VARARG -} - private fun String.shorten(maxLength: Int) = lineSequence().first().let { if (it.length != length || it.length > maxLength) it.take(maxLength - 3) + "..." else it } diff --git a/core/src/main/kotlin/plugability/extensions.kt b/core/src/main/kotlin/plugability/extensions.kt index 46c356df..1f994e75 100644 --- a/core/src/main/kotlin/plugability/extensions.kt +++ b/core/src/main/kotlin/plugability/extensions.kt @@ -96,7 +96,8 @@ class ExtendingDSL(private val pluginClass: String, private val extensionName: S ExtensionOrdered(extensionPoint, pluginClass, extensionName, action, block) infix fun Extension.applyIf(condition: DokkaConfiguration.() -> Boolean): Extension = - this.setCondition(condition) + this.setCondition { this@applyIf.condition(this) && condition(this) } + } @ExtensionsDsl -- cgit