From 64e600b126ae8edcfbb3c2716febb01d221520b5 Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Tue, 14 Apr 2020 14:14:31 +0200
Subject: Fix path clash with top-level declarations, catch link resolving
 exception, remove default values while merging, merge expect by targets

---
 core/src/main/kotlin/model/defaultValues.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'core')

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
-- 
cgit