diff options
| author | Kamil Doległo <kamilok1965@interia.pl> | 2020-04-14 14:14:31 +0200 |
|---|---|---|
| committer | Kamil Doległo <kamilok1965@interia.pl> | 2020-04-15 12:15:04 +0200 |
| commit | 64e600b126ae8edcfbb3c2716febb01d221520b5 (patch) | |
| tree | 63e1c32599e1525fed431cb26b10d4d3e7239c49 /core/src/main | |
| parent | bc843d67b455e484cd05cdf28e5ce5dec68119d4 (diff) | |
| download | dokka-64e600b126ae8edcfbb3c2716febb01d221520b5.tar.gz dokka-64e600b126ae8edcfbb3c2716febb01d221520b5.tar.bz2 dokka-64e600b126ae8edcfbb3c2716febb01d221520b5.zip | |
Fix path clash with top-level declarations, catch link resolving exception, remove default values while merging, merge expect by targets
Diffstat (limited to 'core/src/main')
| -rw-r--r-- | core/src/main/kotlin/model/defaultValues.kt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/src/main/kotlin/model/defaultValues.kt b/core/src/main/kotlin/model/defaultValues.kt index 10f6d16d..ab6cd376 100644 --- a/core/src/main/kotlin/model/defaultValues.kt +++ b/core/src/main/kotlin/model/defaultValues.kt @@ -2,10 +2,11 @@ package org.jetbrains.dokka.model import org.jetbrains.dokka.model.properties.ExtraProperty import org.jetbrains.dokka.model.properties.MergeStrategy -import java.lang.IllegalStateException class DefaultValue(val value: String): ExtraProperty<DParameter> { - companion object : ExtraProperty.Key<DParameter, DefaultValue> + companion object : ExtraProperty.Key<DParameter, DefaultValue> { + override fun mergeStrategyFor(left: DefaultValue, right: DefaultValue): MergeStrategy<DParameter> = MergeStrategy.Remove // TODO pass a logger somehow and log this + } override val key: ExtraProperty.Key<DParameter, *> get() = Companion |