diff options
| author | Szymon Świstun <sswistun@virtuslab.com> | 2020-03-04 17:46:19 +0100 |
|---|---|---|
| committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-03-17 14:38:44 +0100 |
| commit | f94bbdc3bfa66bf2d485007739ce19a3befda98c (patch) | |
| tree | 34b22233849ec7b79d10071ccd7a8417ed12de36 /core | |
| parent | 128e3fee4182c0957e266accc99b174815486520 (diff) | |
| download | dokka-f94bbdc3bfa66bf2d485007739ce19a3befda98c.tar.gz dokka-f94bbdc3bfa66bf2d485007739ce19a3befda98c.tar.bz2 dokka-f94bbdc3bfa66bf2d485007739ce19a3befda98c.zip | |
Combine multiple applyIf
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/kotlin/model/Documentable.kt | 5 | ||||
| -rw-r--r-- | 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 <T : Any> Extension<T>.applyIf(condition: DokkaConfiguration.() -> Boolean): Extension<T> = - this.setCondition(condition) + this.setCondition { this@applyIf.condition(this) && condition(this) } + } @ExtensionsDsl |