From b2ab395be8cb1560088987aa5132d3782596fc80 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Mon, 15 Jun 2020 15:17:27 +0200 Subject: Fix tests --- .../kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'plugins/base/src/main/kotlin') diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt index 18a1dc3c..f3102b2d 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 ?: "", DRI.from(it)) } + is PsiReferenceExpression -> psiReference?.let { EnumValue(text ?: "", DRI.from(it)) } is PsiClassObjectAccessExpression -> ClassValue( text ?: "", DRI.from(((type as PsiImmediateClassType).parameters.single() as PsiClassReferenceType).resolve()!!) @@ -429,7 +429,7 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator { else -> StringValue(text ?: "") } - private fun PsiAnnotation.toAnnotation() = driOfReference()?.let { + private fun PsiAnnotation.toAnnotation() = psiReference?.let { Annotations.Annotation( DRI.from(it), attributes.filter { it !is KtLightAbstractAnnotation }.mapNotNull { it.attributeName to it.toValue() } @@ -440,7 +440,8 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator { ) } - private fun PsiElement.driOfReference() = getChildOfType()?.resolve() + private val PsiElement.psiReference + get() = getChildOfType()?.resolve() } private data class Ancestor(val dri: DRI, val isInterface: Boolean) -- cgit