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

Special value for class literal expression

Browse Source 
Starting from Idea 172 evaluator gives non-null value for class literal
expression. Probably behaviour was changed in

https://github.com/JetBrains/intellij-community/commit/65ddb4c454110190b8d7374f1f3058ec03a59c5e
This commit is contained in:
Nikolay Krasko
2017-08-07 21:02:01 +03:00
parent eeede71d9d
commit 46bbf55acd
1 changed files with 5 additions and 1 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
+5 -1
View File
@@ -25,10 +25,15 @@ abstract class JavaAnnotationArgumentImpl(
) : JavaAnnotationArgument { ) : JavaAnnotationArgument {
companion object Factory { companion object Factory {
fun create(argument: PsiAnnotationMemberValue, name: Name?): JavaAnnotationArgument { fun create(argument: PsiAnnotationMemberValue, name: Name?): JavaAnnotationArgument {
if (argument is PsiClassObjectAccessExpression) {
return JavaClassObjectAnnotationArgumentImpl(argument, name)
}
val value = JavaPsiFacade.getInstance(argument.project).constantEvaluationHelper.computeConstantExpression(argument) val value = JavaPsiFacade.getInstance(argument.project).constantEvaluationHelper.computeConstantExpression(argument)
if (value is Enum<*>) { if (value is Enum<*>) {
return JavaEnumValueAnnotationArgumentImpl(argument as PsiReferenceExpression, name) 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)
} }
@@ -37,7 +42,6 @@ abstract class JavaAnnotationArgumentImpl(
is PsiReferenceExpression -> JavaEnumValueAnnotationArgumentImpl(argument, name) is PsiReferenceExpression -> JavaEnumValueAnnotationArgumentImpl(argument, name)
is PsiArrayInitializerMemberValue -> JavaArrayAnnotationArgumentImpl(argument, name) is PsiArrayInitializerMemberValue -> JavaArrayAnnotationArgumentImpl(argument, name)
is PsiAnnotation -> JavaAnnotationAsAnnotationArgumentImpl(argument, name) is PsiAnnotation -> JavaAnnotationAsAnnotationArgumentImpl(argument, name)
is PsiClassObjectAccessExpression -> JavaClassObjectAnnotationArgumentImpl(argument, name)
else -> throw UnsupportedOperationException("Unsupported annotation argument type: " + argument) else -> throw UnsupportedOperationException("Unsupported annotation argument type: " + argument)
} }
} }