diff options
3 files changed, 2 insertions, 11 deletions
diff --git a/core/src/main/kotlin/model/classKinds.kt b/core/src/main/kotlin/model/classKinds.kt index 2548f68d..be8c47b0 100644 --- a/core/src/main/kotlin/model/classKinds.kt +++ b/core/src/main/kotlin/model/classKinds.kt @@ -1,10 +1,5 @@ package org.jetbrains.dokka.model -import org.jetbrains.dokka.links.DRI -import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe -import org.jetbrains.kotlin.types.KotlinType - - interface ClassKind enum class KotlinClassKindTypes : ClassKind { diff --git a/core/src/main/kotlin/utilities/genericUtils.kt b/core/src/main/kotlin/utilities/genericUtils.kt deleted file mode 100644 index e94e4e8f..00000000 --- a/core/src/main/kotlin/utilities/genericUtils.kt +++ /dev/null @@ -1,3 +0,0 @@ -package org.jetbrains.dokka.utilities - -fun <T : Any, S : Any> Pair<T?, S?>.pullOutNull(): Pair<T, S>? = first?.let { f -> second?.let { s -> f to s } }
\ No newline at end of file diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt index f2e6f177..6b612733 100644 --- a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt +++ b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt @@ -5,7 +5,6 @@ import org.jetbrains.dokka.model.Enum import org.jetbrains.dokka.model.Function import org.jetbrains.dokka.plugability.DokkaContext import org.jetbrains.dokka.transformers.documentation.DocumentableMerger -import org.jetbrains.dokka.utilities.pullOutNull internal object DefaultDocumentableMerger : DocumentableMerger { override fun invoke(modules: Collection<Module>, context: DokkaContext): Module { @@ -51,7 +50,7 @@ fun Function.mergeWith(other: Function): Function = Function( name, returnType, isConstructor, - (receiver to other.receiver).pullOutNull()?.let { (f, s) -> f.mergeWith(s) }, + other.receiver?.let { receiver?.mergeWith(it) }, merge(parameters + other.parameters, Parameter::mergeWith), expected?.mergeWith(other.expected), (actual + other.actual).merge(), @@ -61,7 +60,7 @@ fun Function.mergeWith(other: Function): Function = Function( fun Property.mergeWith(other: Property) = Property( dri, name, - (receiver to other.receiver).pullOutNull()?.let { (f, s) -> f.mergeWith(s) }, + other.receiver?.let { receiver?.mergeWith(it) }, expected?.mergeWith(other.expected), (actual + other.actual).merge(), accessors = (this.accessors + other.accessors).distinct(), |