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

Allow property annotations on primary constructor parameter

Browse Source
This commit is contained in:
Yan Zhulanow
2015-08-04 15:21:53 +03:00
parent 08c678ef46
commit 8b47f56eb9
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUseSiteTargetChecker.kt
+18 -13
View File
@@ -79,34 +79,39 @@ public object AnnotationUseSiteTargetChecker {
modifierListOwner: JetAnnotated, modifierListOwner: JetAnnotated,
descriptor: DeclarationDescriptor, descriptor: DeclarationDescriptor,
annotationWithTarget: AnnotationWithTarget) { annotationWithTarget: AnnotationWithTarget) {
if (checkIfPropertyDescriptor(descriptor, annotationWithTarget)) return val propertyDescriptor = checkIfPropertyDescriptor(descriptor, annotationWithTarget) ?: return
descriptor as PropertyDescriptor
val hasDelegate = modifierListOwner is JetProperty && modifierListOwner.hasDelegate() val hasDelegate = modifierListOwner is JetProperty && modifierListOwner.hasDelegate()
if (!hasDelegate && !(bindingContext.get(BindingContext.BACKING_FIELD_REQUIRED, descriptor) ?: false)) { if (!hasDelegate && !(bindingContext.get(BindingContext.BACKING_FIELD_REQUIRED, propertyDescriptor) ?: false)) {
report(annotationWithTarget.annotation, INAPPLICABLE_FIELD_TARGET_NO_BACKING_FIELD) report(annotationWithTarget.annotation, INAPPLICABLE_FIELD_TARGET_NO_BACKING_FIELD)
} }
} }
private fun BindingTrace.checkMutableProperty(descriptor: DeclarationDescriptor, annotationWIthTarget: AnnotationWithTarget) { private fun BindingTrace.checkMutableProperty(descriptor: DeclarationDescriptor, annotationWIthTarget: AnnotationWithTarget) {
checkIfPropertyDescriptor(descriptor, annotationWIthTarget) val propertyDescriptor = checkIfPropertyDescriptor(descriptor, annotationWIthTarget) ?: return
if (descriptor is PropertyDescriptor) { if (!propertyDescriptor.isVar) {
if (!descriptor.isVar) { report(annotationWIthTarget.annotation, INAPPLICABLE_TARGET_PROPERTY_IMMUTABLE)
report(annotationWIthTarget.annotation, INAPPLICABLE_TARGET_PROPERTY_IMMUTABLE)
}
} }
} }
private fun BindingTrace.checkIfPropertyDescriptor( private fun BindingTrace.checkIfPropertyDescriptor(
descriptor: DeclarationDescriptor, descriptor: DeclarationDescriptor,
annotationWithTarget: AnnotationWithTarget): Boolean { annotationWithTarget: AnnotationWithTarget): PropertyDescriptor? {
if (descriptor !is PropertyDescriptor) { if (descriptor is PropertyDescriptor) {
report(annotationWithTarget, INAPPLICABLE_TARGET_ON_PROPERTY) return descriptor
return true
} }
return false else if (descriptor is ValueParameterDescriptor) {
val jetParameter = DescriptorToSourceUtils.descriptorToDeclaration(descriptor) as? JetParameter
if (jetParameter != null && jetParameter.hasValOrVar()) {
val propertyDescriptor = bindingContext[BindingContext.VALUE_PARAMETER_AS_PROPERTY, descriptor]
if (propertyDescriptor != null) return propertyDescriptor
}
}
report(annotationWithTarget, INAPPLICABLE_TARGET_ON_PROPERTY)
return null
} }
private fun BindingTrace.report(annotation: AnnotationDescriptor, diagnosticFactory: DiagnosticFactory0<PsiElement>) { private fun BindingTrace.report(annotation: AnnotationDescriptor, diagnosticFactory: DiagnosticFactory0<PsiElement>) {