Hides internal annotations from rendering #947

4 files changed, 21 insertions, 20 deletions

diff --git a/core/src/main/kotlin/model/aditionalExtras.kt b/core/src/main/kotlin/model/aditionalExtras.kt
index b4355d4b..94d0e751 100644
--- a/core/src/main/kotlin/model/aditionalExtras.kt
+++ b/core/src/main/kotlin/model/aditionalExtras.kt
@@ -29,7 +29,7 @@ class Annotations(val content: SourceSetDependent<List<Annotation>>) : ExtraProp
 
     override val key: ExtraProperty.Key<Documentable, *> = Annotations
 
-    data class Annotation(val dri: DRI, val params: Map<String, AnnotationParameterValue>) {
+    data class Annotation(val dri: DRI, val params: Map<String, AnnotationParameterValue>, val mustBeDocumented: Boolean = false) {
         override fun equals(other: Any?): Boolean = when (other) {
             is Annotation -> dri == other.dri
             else -> false
diff --git a/plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt b/plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt
index 872dd4db..a551efdc 100644
--- a/plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt
+++ b/plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt
@@ -42,7 +42,7 @@ interface JvmSignatureUtils {
         else -> null
     }?.let {
         it.entries.forEach {
-            it.value.filter { it !in ignored }.takeIf { it.isNotEmpty() }?.let { annotations ->
+            it.value.filter { it !in ignored && it.mustBeDocumented }.takeIf { it.isNotEmpty() }?.let { annotations ->
                 group(sourceSets = setOf(it.key), styles = styles, kind = ContentKind.Annotations) {
                     annotations.forEach {
                         operation(it)
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index 9dc87d91..ad872e2a 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -22,7 +22,9 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotated
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies
 import org.jetbrains.kotlin.idea.kdoc.findKDoc
+import org.jetbrains.kotlin.idea.kdoc.isBoringBuiltinClass
 import org.jetbrains.kotlin.load.kotlin.toSourceElement
+import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.calls.callUtil.getValueArgumentsInParentheses
@@ -33,6 +35,7 @@ import org.jetbrains.kotlin.resolve.constants.KClassValue.Value.NormalClass
 import org.jetbrains.kotlin.resolve.descriptorUtil.annotationClass
 import org.jetbrains.kotlin.resolve.descriptorUtil.getAllSuperclassesWithoutAny
 import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperInterfaces
+import org.jetbrains.kotlin.resolve.jvm.isInlineClassThatRequiresMangling
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.resolve.source.KotlinSourceElement
@@ -694,18 +697,15 @@ private class DokkaDescriptorVisitor(
     }
 
     private fun AnnotationDescriptor.toAnnotation(): Annotations.Annotation? =
-        if(annotationClass?.visibility == Visibilities.PUBLIC)
-            DRI.from(annotationClass as DeclarationDescriptor)
-                .takeIf { it.classNames != "<ERROR CLASS>" }?.let {
-                    Annotations.Annotation(
-                        it,
-                        allValueArguments.map { it.key.asString() to it.value.toValue() }.filter {
-                            it.second != null
-                        }.toMap() as Map<String, AnnotationParameterValue>
-                    )
-                }
-        else
-            null
+        DRI.from(annotationClass as DeclarationDescriptor).let {
+            Annotations.Annotation(
+                it,
+                allValueArguments.map { it.key.asString() to it.value.toValue() }.filter {
+                    it.second != null
+                }.toMap() as Map<String, AnnotationParameterValue>,
+                annotationClass!!.annotations.hasAnnotation(FqName("kotlin.annotation.MustBeDocumented"))
+            )
+        }
 
     private fun PropertyDescriptor.getAnnotationsWithBackingField(): List<Annotations.Annotation> =
         getAnnotations() + (backingField?.getAnnotations() ?: emptyList())
diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
index 30204d01..18a1dc3c 100644
--- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
@@ -421,7 +421,7 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
         private fun PsiAnnotationMemberValue.toValue(): AnnotationParameterValue? = when (this) {
             is PsiAnnotation -> toAnnotation()?.let { AnnotationValue(it) }
             is PsiArrayInitializerMemberValue -> ArrayValue(initializers.mapNotNull { it.toValue() })
-            is PsiReferenceExpression -> driOfReference()?.let { EnumValue(text ?: "", it) }
+            is PsiReferenceExpression -> driOfReference()?.let { EnumValue(text ?: "", DRI.from(it)) }
             is PsiClassObjectAccessExpression -> ClassValue(
                 text ?: "",
                 DRI.from(((type as PsiImmediateClassType).parameters.single() as PsiClassReferenceType).resolve()!!)
@@ -431,15 +431,16 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
 
         private fun PsiAnnotation.toAnnotation() = driOfReference()?.let {
             Annotations.Annotation(
-                it,
+                DRI.from(it),
                 attributes.filter { it !is KtLightAbstractAnnotation }.mapNotNull { it.attributeName to it.toValue() }
-                    .toMap()
+                    .toMap(),
+                (it as PsiClass).annotations.any {
+                    hasQualifiedName("java.lang.annotation.Documented")
+                }
             )
         }
 
-        private fun PsiElement.driOfReference() = getChildOfType<PsiJavaCodeReferenceElement>()?.resolve()?.let {
-            DRI.from(it)
-        }
+        private fun PsiElement.driOfReference() = getChildOfType<PsiJavaCodeReferenceElement>()?.resolve()
     }
 
     private data class Ancestor(val dri: DRI, val isInterface: Boolean)