Fix missing annotations in GFM and unresolved static imports (#1845)

* Fix missing unresolved links in GFM

* Fix missing links to elements imported as static

1 files changed, 12 insertions, 1 deletions

diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
index 84510824..cd2bbfc6 100644
--- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
@@ -2,6 +2,8 @@ package org.jetbrains.dokka.base.translators.psi
 
 import com.intellij.lang.jvm.JvmModifier
 import com.intellij.lang.jvm.annotation.JvmAnnotationAttribute
+import com.intellij.lang.jvm.annotation.JvmAnnotationAttributeValue
+import com.intellij.lang.jvm.annotation.JvmAnnotationEnumFieldValue
 import com.intellij.lang.jvm.types.JvmReferenceType
 import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.psi.*
@@ -572,13 +574,22 @@ class DefaultPsiToDocumentableTranslator(
             filter { it !is KtLightAbstractAnnotation }.mapNotNull { it.toAnnotation() }
 
         private fun JvmAnnotationAttribute.toValue(): AnnotationParameterValue = when (this) {
-            is PsiNameValuePair -> value?.toValue() ?: StringValue("")
+            is PsiNameValuePair -> value?.toValue() ?: attributeValue?.toValue() ?: StringValue("")
             else -> StringValue(this.attributeName)
         }.let { annotationValue ->
             if (annotationValue is StringValue) annotationValue.copy(unquotedValue(annotationValue.value))
             else annotationValue
         }
 
+        /**
+         * This is a workaround for static imports from JDK like RetentionPolicy
+         * For some reason they are not represented in the same way than using normal import
+         */
+        private fun JvmAnnotationAttributeValue.toValue(): AnnotationParameterValue? = when (this) {
+            is JvmAnnotationEnumFieldValue -> (field as? PsiElement)?.let { EnumValue(fieldName ?: "", DRI.from(it)) }
+            else -> null
+        }
+
         private fun PsiAnnotationMemberValue.toValue(): AnnotationParameterValue? = when (this) {
             is PsiAnnotation -> toAnnotation()?.let { AnnotationValue(it) }
             is PsiArrayInitializerMemberValue -> ArrayValue(initializers.mapNotNull { it.toValue() })