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

Kapt: Support String[] in annotation proxy

Browse Source 
(cherry picked from commit 5e9eab9)
This commit is contained in:
Yan Zhulanow
2016-08-23 18:46:03 +03:00
committed by Yan Zhulanow
parent 0042a59fb6
commit cd44540965
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/java-model-wrappers/src/org/jetbrains/kotlin/java/model/internal/KotlinAnnotationProxyMaker.kt
+8 -6
View File
@@ -64,6 +64,8 @@ class KotlinAnnotationProxyMaker(val annotation: PsiAnnotation, val annotationCl
}
}
private val JAVA_LANG_STRING = "java.lang.String"
private fun getConstantValue(
psiValue: PsiAnnotationMemberValue,
returnType: PsiType,
@@ -74,7 +76,7 @@ private fun getConstantValue(
when {
returnType == PsiType.NULL || returnType == PsiType.VOID -> unexpectedType("void")
returnType.fqName == "java.lang.String" -> return (psiValue as? PsiExpression)?.calcConstantValue(evaluator)
returnType.fqName == JAVA_LANG_STRING -> return (psiValue as? PsiExpression)?.calcConstantValue(evaluator)
jReturnType.isAnnotation -> {
if (psiValue !is PsiAnnotation) error("psiValue is not a PsiAnnotation")
val annotationClass = PsiTypesUtil.getPsiClass(returnType) ?: error("Can't resolve type $returnType")
@@ -91,16 +93,16 @@ private fun getConstantValue(
else -> listOf(psiValue)
}
if (!jComponentType.isPrimitive && !jComponentType.isAnnotation) {
val typeMirrors = arrayValues.map { getObjectType(it).toJeType(manager) }
return MirroredTypesExceptionProxy(Collections.unmodifiableList(typeMirrors))
} else {
if (jComponentType.isPrimitive || jComponentType.isAnnotation || jComponentType.canonicalName == JAVA_LANG_STRING) {
val arr = Array.newInstance(jComponentType, arrayValues.size)
arrayValues.forEachIndexed { i, componentPsiValue ->
arrayValues.forEachIndexed { i, componentPsiValue ->
val componentValue = getConstantValue(componentPsiValue, returnType.componentType, jComponentType, evaluator)
try { Array.set(arr, i, componentValue) } catch (e: IllegalArgumentException) { return null }
}
return arr
} else {
val typeMirrors = arrayValues.map { getObjectType(it).toJeType(manager) }
return MirroredTypesExceptionProxy(Collections.unmodifiableList(typeMirrors))
}
}
jReturnType.isEnum -> {