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

Kapt: Minor, refactor JeAnnotationMirror:getElementValues()

Browse Source 
(cherry picked from commit 649b938)
This commit is contained in:
Yan Zhulanow
2016-08-02 22:46:31 +03:00
committed by Yan Zhulanow
parent 23b343bb03
commit cd09f2bcb8
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/java-model-wrappers/src/org/jetbrains/kotlin/java/model/elements/JeAnnotationMirror.kt
+7 -15
View File
@@ -33,27 +33,19 @@ class JeAnnotationMirror(val psi: PsiAnnotation) : AnnotationMirror {
return JeDeclaredType(PsiTypesUtil.getClassType(psiClass), psiClass)
}
override fun getElementValues(): Map<out ExecutableElement, AnnotationValue> {
val annotationClass = resolveAnnotationClass() ?: return emptyMap()
return mutableMapOf<ExecutableElement, AnnotationValue>().apply {
for (attribute in psi.parameterList.attributes) {
val attributeValue = attribute.value ?: continue
val method = annotationClass.methods.firstOrNull {
it is PsiAnnotationMethod && it.name == attribute.name
} ?: return emptyMap()
put(JeMethodExecutableElement(method), JeAnnotationValue(attributeValue))
}
}
}
override fun getElementValues(): Map<out ExecutableElement, AnnotationValue> = getElementValues(false)
fun getAllElementValues(): Map<out ExecutableElement, AnnotationValue> = getElementValues(true)
fun getAllElementValues(): Map<out ExecutableElement, AnnotationValue> {
private fun getElementValues(withDefaults: Boolean): Map<out ExecutableElement, AnnotationValue> {
val annotationClass = resolveAnnotationClass() ?: return emptyMap()
return mutableMapOf<ExecutableElement, AnnotationValue>().apply {
for (method in annotationClass.methods) {
method as? PsiAnnotationMethod ?: continue
val attributeValue = psi.findAttributeValue(method.name) ?: method.defaultValue ?: continue
val attributeValue = psi.findDeclaredAttributeValue(method.name)
?: (if (withDefaults) method.defaultValue else null)
?: continue
put(JeMethodExecutableElement(method), JeAnnotationValue(attributeValue))
}
}