azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tests with annotations: enum constants are now resolved as constants in JavaConstantExpressionEvaluator

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-12-10 10:33:05 +03:00
committed by Nikolay Krasko
parent 601a33f772
commit 43249e928c
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/annotationArgumentsImpl.kt
+3
View File
@@ -26,6 +26,9 @@ abstract class JavaAnnotationArgumentImpl(
class object { class object {
fun create(argument: PsiAnnotationMemberValue, name: Name?): JavaAnnotationArgument { fun create(argument: PsiAnnotationMemberValue, name: Name?): JavaAnnotationArgument {
val value = JavaPsiFacade.getInstance(argument.getProject()).getConstantEvaluationHelper().computeConstantExpression(argument) val value = JavaPsiFacade.getInstance(argument.getProject()).getConstantEvaluationHelper().computeConstantExpression(argument)
if (value is Enum<*>) {
return JavaEnumValueAnnotationArgumentImpl(argument as PsiReferenceExpression, name)
}
if (value != null || argument is PsiLiteralExpression) { if (value != null || argument is PsiLiteralExpression) {
return JavaLiteralAnnotationArgumentImpl(name, value) return JavaLiteralAnnotationArgumentImpl(name, value)
} }