KtLightAnnotationForSourceEntry fix for reading unnamed java-annotation parameter

This commit is contained in:
Nicolay Mitropolsky
2017-08-28 19:14:35 +03:00
committed by Pavel Talanov
parent e1924e0d2f
commit 108a40261b
2 changed files with 31 additions and 4 deletions
@@ -107,7 +107,7 @@ class KtLightAnnotationForSourceEntry(
val annotationConstructor = resolvedCall.resultingDescriptor
val parameterName =
memberValue.getNonStrictParentOfType<PsiNameValuePair>()?.name ?:
memberValue.getNonStrictParentOfType<PsiAnnotationMethod>()?.name ?:
memberValue.getNonStrictParentOfType<PsiAnnotationMethod>()?.takeIf { it.containingClass?.isAnnotationType == true }?.name ?:
"value"
val parameter = annotationConstructor.valueParameters.singleOrNull { it.name.asString() == parameterName } ?: return null
@@ -49,10 +49,31 @@ class KtLightAnnotationTest : KotlinLightCodeInsightFixtureTestCase() {
val annotations = myFixture.findClass("AnnotatedClass").fields.single()
.expectAnnotations(2).single { it.qualifiedName == "Autowired" }
val annotationAttributeVal = annotations.findAttributeValue("required") as PsiElement
assertTextAndRange("true", annotationAttributeVal)
assertTextRangeAndValue("true", true, annotationAttributeVal)
}
val computed = JavaPsiFacade.getInstance(project).constantEvaluationHelper.computeConstantExpression(annotationAttributeVal)
TestCase.assertEquals(true, computed)
fun testStringAnnotationWithUnnamedParameter() {
myFixture.addClass("""
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target(ElementType.PARAMETER)
public @interface Qualifier {
String value();
}
""".trimIndent())
myFixture.configureByText("AnnotatedClass.kt", """
class AnnotatedClass {
fun bar(@Qualifier("foo") param: String){}
}
""".trimIndent())
myFixture.testHighlighting("Qualifier.java", "AnnotatedClass.kt")
val annotations = myFixture.findClass("AnnotatedClass").methods.first { it.name == "bar" }.parameterList.parameters.single()
.expectAnnotations(2).single { it.qualifiedName == "Qualifier" }
val annotationAttributeVal = annotations.findAttributeValue("value") as PsiElement
assertTextRangeAndValue("\"foo\"", "foo", annotationAttributeVal)
}
fun testAnnotationsInAnnotationsDeclarations() {
@@ -347,6 +368,12 @@ class KtLightAnnotationTest : KotlinLightCodeInsightFixtureTestCase() {
TestCase.assertEquals(expected, psiElement.textRange.substring(psiElement.containingFile.text))
}
private fun assertTextRangeAndValue(expected: String, value: Any?, psiElement: PsiElement) {
assertTextAndRange(expected, psiElement)
val result = JavaPsiFacade.getInstance(project).constantEvaluationHelper.computeConstantExpression(psiElement)
TestCase.assertEquals(value, result)
}
private fun PsiModifierListOwner.expectAnnotations(number: Int): Array<PsiAnnotation> =
this.annotations.apply {
TestCase.assertEquals("expected one annotation, found ${this.joinToString(", ") { it.qualifiedName ?: "unknown" }}",