From 2717e8505a41e188d209b81a3150a16c64ca7239 Mon Sep 17 00:00:00 2001 From: Marcin Aman Date: Thu, 4 Mar 2021 15:59:35 +0100 Subject: Obvious functions should also work for interfaces (#1763) --- .../descriptors/DefaultDescriptorToDocumentableTranslator.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'plugins/base/src/main/kotlin') diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt index bc45337a..ed5b8c86 100644 --- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt +++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt @@ -493,7 +493,7 @@ private class DokkaDescriptorVisitor( descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(), (descriptor.getAnnotations() + descriptor.fileLevelAnnotations()).toSourceSetDependent() .toAnnotations(), - ObviousMember.takeIf { descriptor.isFake }, + ObviousMember.takeIf { descriptor.isObvious }, ) ) } @@ -1038,8 +1038,11 @@ private class DokkaDescriptorVisitor( ?.parallelMap { it.toAnnotation(scope = Annotations.AnnotationScope.FILE) } .orEmpty() - private val FunctionDescriptor.isFake: Boolean - get() = kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE || kind == CallableMemberDescriptor.Kind.SYNTHESIZED + private val FunctionDescriptor.isObvious: Boolean + get() = kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE || + kind == CallableMemberDescriptor.Kind.SYNTHESIZED || + containingDeclaration.fqNameOrNull()?.asString() + ?.let { it == "kotlin.Any" || it == "kotlin.Enum" } == true } private data class AncestryLevel( -- cgit