Handling of annotations on delegated property in descriptor loader & stub builder

2016-01-15 18:33:04 +03:00
parent e4f7446bec
commit 7f2624c9a1
10 changed files with 75 additions and 7 deletions
@@ -138,9 +138,11 @@ class AnnotationLoaderForClassFileStubBuilder(
        return null
    }

-    override fun loadPropertyAnnotations(propertyAnnotations: List<ClassId>, fieldAnnotations: List<ClassId>): List<ClassIdWithTarget> {
+    override fun loadPropertyAnnotations(
+            propertyAnnotations: List<ClassId>, fieldAnnotations: List<ClassId>, fieldUseSiteTarget: AnnotationUseSiteTarget
+    ): List<ClassIdWithTarget> {
        return propertyAnnotations.map { ClassIdWithTarget(it, null) } +
-               fieldAnnotations.map { ClassIdWithTarget(it, AnnotationUseSiteTarget.FIELD) }
+               fieldAnnotations.map { ClassIdWithTarget(it, fieldUseSiteTarget ) }
    }

    override fun transformAnnotations(annotations: List<ClassId>) = annotations.map { ClassIdWithTarget(it, null) }