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

Minor refactoring in deprecationUtil.kt

Browse Source 
Split getDeclaredDeprecatedAnnotation into two methods for clarity
This commit is contained in:
Alexander Udalov
2016-12-14 14:22:37 +03:00
parent 122c631fcf
commit 82703d9cfd
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt
+8 -4
View File
@@ -136,7 +136,7 @@ private fun deprecationByOverridden(root: CallableMemberDescriptor): Deprecation
}
private fun DeclarationDescriptor.getDeprecationByAnnotation(): DeprecatedByAnnotation? {
val ownAnnotation = getDeclaredDeprecatedAnnotation(AnnotationUseSiteTarget.getAssociatedUseSiteTarget(this))
val ownAnnotation = getDeclaredDeprecatedAnnotation(AnnotationUseSiteTarget.getAssociatedUseSiteTarget(this), true)
if (ownAnnotation != null)
return DeprecatedByAnnotation(ownAnnotation, this)
@@ -168,12 +168,16 @@ private fun DeclarationDescriptor.getDeprecationByAnnotation(): DeprecatedByAnno
return null
}
private fun DeclarationDescriptor.getDeclaredDeprecatedAnnotation(): AnnotationDescriptor? {
return annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.deprecated) ?: annotations.findAnnotation(JAVA_DEPRECATED)
}
private fun DeclarationDescriptor.getDeclaredDeprecatedAnnotation(
target: AnnotationUseSiteTarget? = null,
findAnnotationsWithoutTarget: Boolean = true
target: AnnotationUseSiteTarget?,
findAnnotationsWithoutTarget: Boolean
): AnnotationDescriptor? {
if (findAnnotationsWithoutTarget) {
val annotations = annotations.findAnnotation(KotlinBuiltIns.FQ_NAMES.deprecated) ?: annotations.findAnnotation(JAVA_DEPRECATED)
val annotations = getDeclaredDeprecatedAnnotation()
if (annotations != null) return annotations
}