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

Do not report deprecation on members of deprecated companion

Browse Source 
This deprecation is reported on the companion itself anyway
This commit is contained in:
Alexander Udalov
2016-09-19 13:26:18 +03:00
parent b08ed14f66
commit 8949ffbef1
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt
+1 -8
View File
@@ -112,7 +112,7 @@ private fun deprecationByOverridden(root: CallableMemberDescriptor): Deprecation
return
}
else -> {
overriddenDescriptors.forEach { traverse(it) }
overriddenDescriptors.forEach(::traverse)
}
}
}
@@ -147,13 +147,6 @@ private fun DeclarationDescriptor.getDeprecationByAnnotation(): DeprecatedByAnno
val propertyAnnotation = propertyDescriptor.getDeclaredDeprecatedAnnotation()
if (propertyAnnotation != null)
return DeprecatedByAnnotation(propertyAnnotation, propertyDescriptor)
val classDescriptor = containingDeclaration as? ClassDescriptor
if (classDescriptor != null && classDescriptor.isCompanionObject) {
val classAnnotation = classDescriptor.getDeclaredDeprecatedAnnotation()
if (classAnnotation != null)
return DeprecatedByAnnotation(classAnnotation, classDescriptor)
}
}
}
return null