Alexander Udalov
fc87043cb3
Add PropertyDescriptor.backingField/delegateField to store annotations on the field directly in an otherwise almost empty descriptor instance, instead of storing them with use-sites in the corresponding property descriptor. Instead of AnnotationWithTarget, create AnnotationDescriptor instances in AnnotationSplitter. Change DescriptorRenderer to render annotations on "related" declarations when needed, with the explicit use-site target if applicable. Most changes in diagnostic test data are related to the fact that annotations which are known to have an incompatible use-site to the declaration they're applied at (such as `@param:`-annotation on a function), are now not loaded at all. It's fine because the code is erroneous, so it doesn't really matter how do we load annotations with invalid targets (some of this logic is also changed freely in subsequent commits). Some changes are also explained by the fact that for example an annotation on the property which is only applicable to FIELD is now rendered with an explicit use-site target `@field:`, regardless of whether it did have that use-site target syntactically or not. Basically, after this change there's no point in calling Annotations.getUseSiteTargetedAnnotations/getAllAnnotations anymore because it's easier and more intuitive to just use Annotations of the corresponding descriptor -- the backing / delegate field (introduced in this commit) or the extension receiver / setter parameter (related behavior was fixed in previous commits). Usages of use-site-target-related methods will be refactored out in subsequent commits
116 lines
5.8 KiB
Plaintext
Vendored
116 lines
5.8 KiB
Plaintext
Vendored
package
|
|
|
|
public final annotation class Ann : kotlin.Annotation {
|
|
public constructor Ann()
|
|
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
|
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
|
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
|
}
|
|
|
|
public final annotation class AnnRepeat : kotlin.Annotation {
|
|
public constructor AnnRepeat()
|
|
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
|
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
|
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
|
}
|
|
|
|
public final class CustomDelegate {
|
|
public constructor CustomDelegate()
|
|
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
|
public final operator fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.reflect.KProperty<*>): kotlin.String
|
|
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
|
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
|
}
|
|
|
|
private final class EffetivelyPrivate {
|
|
private constructor EffetivelyPrivate(/*0*/ x0: kotlin.Int, /*1*/ x1: kotlin.Int, /*2*/ x2: kotlin.Int)
|
|
public final val x0: kotlin.Int
|
|
protected final val x1: kotlin.Int
|
|
internal final val x2: kotlin.Int
|
|
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
|
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
|
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
|
|
|
private final class Nested {
|
|
public constructor Nested()
|
|
public final val fofo: kotlin.Int = 0
|
|
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
|
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
|
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
|
}
|
|
}
|
|
|
|
public final class Foo {
|
|
public constructor Foo(/*0*/ y0: kotlin.Int, /*1*/ vararg y1: kotlin.String /*kotlin.Array<out kotlin.String>*/)
|
|
private final val x1: kotlin.String = ""
|
|
private final var x2: kotlin.String
|
|
@setparam:Ann private final var x3: kotlin.String
|
|
@setparam:Ann @setparam:AnnRepeat private final var x4: kotlin.String
|
|
internal final val x5: kotlin.String = ""
|
|
protected final val x6: kotlin.String = ""
|
|
private final val x7: kotlin.String = ""
|
|
private final var x8: kotlin.String
|
|
private final var x9: kotlin.String
|
|
private final val y0: kotlin.Int
|
|
private final val y1: kotlin.Array<out kotlin.String>
|
|
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
|
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
|
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
|
}
|
|
|
|
private final class Other {
|
|
public constructor Other(/*0*/ @Ann param: kotlin.Int)
|
|
@delegate:Ann private final val delegate: kotlin.String
|
|
@Ann @field:Ann private final val other: kotlin.String = ""
|
|
private final val param: kotlin.Int
|
|
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
|
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
|
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
|
private final fun @receiver:Ann kotlin.Int.receiver(): kotlin.Unit
|
|
}
|
|
|
|
public final class PrivateToThis</*0*/ in I> {
|
|
public constructor PrivateToThis</*0*/ in I>()
|
|
@setparam:Ann private/*private to this*/ final var x0: I
|
|
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
|
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
|
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
|
}
|
|
|
|
@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) public final annotation class SourceAnn : kotlin.Annotation {
|
|
public constructor SourceAnn()
|
|
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
|
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
|
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
|
}
|
|
|
|
public final class Statics {
|
|
public constructor Statics()
|
|
public final lateinit var y0: kotlin.String
|
|
private final lateinit var y1: kotlin.String
|
|
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
|
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
|
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
|
|
|
public companion object Companion {
|
|
private constructor Companion()
|
|
@field:kotlin.jvm.JvmField public final val x0: kotlin.String = ""
|
|
public const final val x1: kotlin.String = ""
|
|
@kotlin.jvm.JvmStatic public final val x2: kotlin.String = ""
|
|
@kotlin.jvm.JvmStatic private final val x3: kotlin.String = ""
|
|
@kotlin.jvm.JvmStatic private final val x4: kotlin.String = ""
|
|
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
|
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
|
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
|
}
|
|
}
|
|
|
|
public final class WithSource {
|
|
public constructor WithSource()
|
|
@setparam:SourceAnn private final var x0: kotlin.String
|
|
private final val x1: kotlin.String = ""
|
|
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
|
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
|
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
|
}
|