Render property accessor annotations in .txt test data

If property accessor rendering is disabled in a test, render annotations
on accessors as use-site-targeted, as was done with
`@setparam:`-annotations. Otherwise they were lost
This commit is contained in:
Alexander Udalov
2018-10-01 18:53:40 +02:00
parent e326b8755f
commit d1e1e274d9
56 changed files with 153 additions and 145 deletions
@@ -2,7 +2,7 @@ package
public final class My {
public constructor My(/*0*/ x: kotlin.Int)
@smartget public final var y: kotlin.Int
@smartget @get:base @get:smartget @get:smartset @set:base @set:smartget @set:smartset public final var y: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@base @smartget @smartset public final fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -75,7 +75,7 @@ package test {
@test.AnnotationTargets.base @test.AnnotationTargets.meta @test.AnnotationTargets.type @test.AnnotationTargets.method @test.AnnotationTargets.multiple public final class KClass {
@test.AnnotationTargets.base @test.AnnotationTargets.method @test.AnnotationTargets.konstructor public constructor KClass()
public constructor KClass(/*0*/ @test.AnnotationTargets.base @test.AnnotationTargets.parameter y: @test.AnnotationTargets.base @test.AnnotationTargets.type kotlin.Int)
@test.AnnotationTargets.base @test.AnnotationTargets.local @field:test.AnnotationTargets.multiple @field:test.AnnotationTargets.fieldann public final val x: kotlin.Int = 0
@test.AnnotationTargets.base @test.AnnotationTargets.local @field:test.AnnotationTargets.multiple @field:test.AnnotationTargets.fieldann @get:test.AnnotationTargets.method @get:test.AnnotationTargets.konstructor @get:test.AnnotationTargets.type public final val x: kotlin.Int = 0
@field:test.AnnotationTargets.fieldann public final val y: @test.AnnotationTargets.base @test.AnnotationTargets.type kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@test.AnnotationTargets.base @test.AnnotationTargets.method @test.AnnotationTargets.multiple @test.AnnotationTargets.konstructor public final fun foo(/*0*/ @test.AnnotationTargets.parameter @test.AnnotationTargets.type i: @test.AnnotationTargets.base @test.AnnotationTargets.multiple kotlin.Int): @test.AnnotationTargets.fieldann @test.AnnotationTargets.parameter kotlin.Int
@@ -1,6 +1,6 @@
package
@unrepann(x = 0) public var annotated: kotlin.Int
@unrepann(x = 0) @get:unrepann(x = 1) public var annotated: kotlin.Int
@unrepann(x = 0) @unrepann(x = 1) public var annotated2: kotlin.Int
@ann(y = 0) @ann(y = 1) public fun foo(/*0*/ @ann(y = 7) @ann(y = 2) x: kotlin.Int): kotlin.Int
@@ -17,11 +17,11 @@ public final class CustomDelegate {
@Ann public final class SomeClass {
public constructor SomeClass()
protected final val delegatedProperty: kotlin.String
protected final var mutableProperty: kotlin.String
public final val propertyWithCustomGetter: kotlin.Int
protected final val simpleProperty: kotlin.String = "text"
protected final val simplePropertyWithAnnotationList: kotlin.String = "text"
@get:Ann protected final val delegatedProperty: kotlin.String
@get:Ann protected final var mutableProperty: kotlin.String
@get:Ann public final val propertyWithCustomGetter: kotlin.Int
@get:Ann protected final val simpleProperty: kotlin.String = "text"
@get:Ann protected final val simplePropertyWithAnnotationList: kotlin.String = "text"
public final fun annotationOnFunction(/*0*/ a: kotlin.Int): kotlin.Int
public final fun anotherFun(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -18,10 +18,10 @@ public final class CustomDelegate {
@Ann public final class SomeClass {
public constructor SomeClass()
protected final var delegatedProperty: kotlin.String
protected final var mutableProperty: kotlin.String
protected final var mutablePropertyWithAnnotationList: kotlin.String
public final var propertyWithCustomSetter: kotlin.Int
@set:Ann protected final var delegatedProperty: kotlin.String
@set:Ann protected final var mutableProperty: kotlin.String
@set:Ann protected final var mutablePropertyWithAnnotationList: kotlin.String
@set:Ann public final var propertyWithCustomSetter: kotlin.Int
protected final val simpleProperty: kotlin.String = "text"
public final fun annotationOnFunction(/*0*/ a: kotlin.Int): kotlin.Int
public final fun anotherFun(): kotlin.Unit
@@ -27,7 +27,7 @@ public final annotation class Ann : kotlin.Annotation {
public final class B {
public constructor B(/*0*/ @fieldOrPropAnn x: kotlin.Int, /*1*/ y: kotlin.Int)
@getSetAndParamAnn @setparam:getSetAndParamAnn public final var w: kotlin.Int
@getSetAndParamAnn @get:getSetAndParamAnn @set:getSetAndParamAnn @setparam:getSetAndParamAnn public final var w: kotlin.Int
@fieldOrPropAnn public final val x: kotlin.Int
@fieldOrPropAnn @fieldOrPropAnn public final val y: kotlin.Int
@fieldOrPropAnn @field:fieldOrPropAnn public final val z: kotlin.Int = 42
@@ -5,7 +5,7 @@ package foo {
public final class Diff {
public constructor Diff()
@kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "") public final var p: kotlin.Int
@kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "") @get:kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "") @set:kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "") public final var p: 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
@@ -45,7 +45,7 @@ package foo {
public open class GetterDeprecated {
public constructor GetterDeprecated()
public open var p: kotlin.Int
@get:kotlin.Deprecated(message = "") public open var p: 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
@@ -91,7 +91,7 @@ package foo {
public open class SetterDeprecated {
public constructor SetterDeprecated()
public open var p: kotlin.Int
@set:kotlin.Deprecated(message = "") public open var p: 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
@@ -1,9 +1,9 @@
package
public val v1: kotlin.String
@get:kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "") public val v1: kotlin.String
@kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "") public val v2: kotlin.String = ""
public var v3: kotlin.String
public var v4: kotlin.String
public var v5: kotlin.String
@get:kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "") public var v3: kotlin.String
@set:kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "") public var v4: kotlin.String
@get:kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "") @set:kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "") public var v5: kotlin.String
@kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "") public var v6: kotlin.String
public fun test(): kotlin.Unit
@@ -16,10 +16,10 @@ public final class Delegate {
public final class PropertyHolder {
public constructor PropertyHolder()
@kotlin.Deprecated(message = "text") public final var name: kotlin.String
public final val test1: kotlin.String = ""
public final var test2: kotlin.String
public final var test3: kotlin.String
public final var test4: kotlin.String
@get:kotlin.Deprecated(message = "val-getter") public final val test1: kotlin.String = ""
@get:kotlin.Deprecated(message = "var-getter") @set:kotlin.Deprecated(message = "var-setter") public final var test2: kotlin.String
@get:kotlin.Deprecated(message = "var-getter") public final var test3: kotlin.String
@set:kotlin.Deprecated(message = "var-setter") public final var test4: kotlin.String
public final val valDelegate: kotlin.Int
public final var varDelegate: kotlin.Int
@kotlin.Deprecated(message = "text") public final val x: kotlin.Int = 1
@@ -7,8 +7,8 @@ public final class PropertyHolder {
public constructor PropertyHolder()
@kotlin.Deprecated(message = "") public final val a1: kotlin.Int = 1
@kotlin.Deprecated(message = "") public final var a2: kotlin.String
public final val withGetter: kotlin.String = ""
public final var withSetter: kotlin.String
@get:kotlin.Deprecated(message = "") public final val withGetter: kotlin.String = ""
@set:kotlin.Deprecated(message = "") public final var withSetter: 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
@@ -4,7 +4,7 @@ public fun test(/*0*/ x: CollectionStringImpl): kotlin.Unit
public open class CollectionStringImpl : kotlin.collections.MutableCollection<kotlin.String!> {
public constructor CollectionStringImpl()
public open override /*1*/ val size: kotlin.Int
@get:java.lang.Override public open override /*1*/ val size: kotlin.Int
@java.lang.Override public open override /*1*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
@java.lang.Override public open override /*1*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
@java.lang.Override public open override /*1*/ fun clear(): kotlin.Unit
@@ -4,7 +4,7 @@ public fun main(): kotlin.Unit
public open class X : kotlin.collections.MutableList<kotlin.String!> {
public constructor X()
public open override /*1*/ val size: kotlin.Int
@get:java.lang.Override public open override /*1*/ val size: kotlin.Int
@java.lang.Override public open override /*1*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
@java.lang.Override public open override /*1*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
@java.lang.Override public open override /*1*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
@@ -36,7 +36,7 @@ public open class X : kotlin.collections.MutableList<kotlin.String!> {
public final class Y : X {
public constructor Y()
public open override /*1*/ /*fake_override*/ val size: kotlin.Int
@get:java.lang.Override public open override /*1*/ /*fake_override*/ val size: kotlin.Int
@java.lang.Override public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
@java.lang.Override public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
@java.lang.Override public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
@@ -68,7 +68,7 @@ public final class Y : X {
public final class Y2 : X {
public constructor Y2()
public open override /*1*/ /*fake_override*/ val size: kotlin.Int
@get:java.lang.Override public open override /*1*/ /*fake_override*/ val size: kotlin.Int
@java.lang.Override public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
@java.lang.Override public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
@java.lang.Override public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
@@ -6,7 +6,7 @@ public operator fun kotlin.CharSequence.contains(/*0*/ other: kotlin.CharSequenc
public open class VcsException : java.lang.Exception {
public constructor VcsException()
public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
public open override /*1*/ val message: kotlin.String
@get:java.lang.Override @get:org.jetbrains.annotations.NotNull public open override /*1*/ val message: kotlin.String
public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ p0: kotlin.Throwable!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
@@ -6,7 +6,7 @@ public operator fun kotlin.CharSequence.contains(/*0*/ other: kotlin.CharSequenc
public open class VcsException : java.lang.Exception {
public constructor VcsException()
public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
public open override /*1*/ val message: kotlin.String
@get:java.lang.Override @get:org.jetbrains.annotations.NotNull public open override /*1*/ val message: kotlin.String
public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
@@ -2,7 +2,7 @@ package
public open class C : kotlin.CharSequence {
public constructor C()
public open override /*1*/ val length: kotlin.Int
@get:java.lang.Override public open override /*1*/ val length: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@java.lang.Override public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.Char
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -12,7 +12,7 @@ public open class C : kotlin.CharSequence {
public final class T : C {
public constructor T()
public open override /*1*/ /*fake_override*/ val length: kotlin.Int
@get:java.lang.Override public open override /*1*/ /*fake_override*/ val length: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@java.lang.Override public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.Char
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -28,10 +28,10 @@ public abstract class AbstractSpecializedMap : kotlin.collections.MutableMap<kot
public open class SpecializedMap : AbstractSpecializedMap {
public constructor SpecializedMap()
public open override /*1*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<kotlin.Int!, kotlin.Double!>>
public open override /*1*/ val keys: kotlin.collections.MutableSet<kotlin.Int!>
public open override /*1*/ val size: kotlin.Int
public open override /*1*/ val values: kotlin.collections.MutableCollection<kotlin.Double!>
@get:org.jetbrains.annotations.NotNull @get:java.lang.Override public open override /*1*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<kotlin.Int!, kotlin.Double!>>
@get:org.jetbrains.annotations.NotNull @get:java.lang.Override public open override /*1*/ val keys: kotlin.collections.MutableSet<kotlin.Int!>
@get:java.lang.Override public open override /*1*/ val size: kotlin.Int
@get:org.jetbrains.annotations.NotNull @get:java.lang.Override public open override /*1*/ val values: kotlin.collections.MutableCollection<kotlin.Double!>
@java.lang.Override public open override /*1*/ fun clear(): kotlin.Unit
public open override /*1*/ fun containsKey(/*0*/ k: kotlin.Int): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun containsKey(/*0*/ x: kotlin.Int!): kotlin.Boolean
@@ -4,7 +4,7 @@ public fun </*0*/ M2 : WithFoo> foo(/*0*/ delegateResolver: ResolverForProject<M
public/*package*/ open class MyMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> : java.util.AbstractMap<K!, V!> {
public/*package*/ constructor MyMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!>()
public open override /*1*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K!, V!>>
@get:java.lang.Override public open override /*1*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K!, V!>>
invisible_fake final override /*1*/ /*fake_override*/ var keySet: kotlin.collections.(Mutable)Set<K!>!
public open override /*1*/ /*fake_override*/ val keys: kotlin.collections.MutableSet<K!>
public open override /*1*/ /*fake_override*/ val size: kotlin.Int
@@ -4,7 +4,7 @@ public fun </*0*/ M2 : WithFoo> foo(/*0*/ delegateResolver: ResolverForProject<M
public/*package*/ open class MyMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> : java.util.AbstractMap<K!, V!> {
public/*package*/ constructor MyMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!>()
public open override /*1*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K!, V!>>
@get:java.lang.Override public open override /*1*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K!, V!>>
invisible_fake final override /*1*/ /*fake_override*/ var keySet: kotlin.collections.(Mutable)Set<K!>!
public open override /*1*/ /*fake_override*/ val keys: kotlin.collections.MutableSet<K!>
public open override /*1*/ /*fake_override*/ val size: kotlin.Int
@@ -1,10 +1,10 @@
package
public val v1: kotlin.String
@get:kotlin.SinceKotlin(version = "1.1") public val v1: kotlin.String
@kotlin.SinceKotlin(version = "1.1") public val v2: kotlin.String = ""
public var v3: kotlin.String
public var v4: kotlin.String
public var v5: kotlin.String
@get:kotlin.SinceKotlin(version = "1.1") public var v3: kotlin.String
@set:kotlin.SinceKotlin(version = "1.1") public var v4: kotlin.String
@get:kotlin.SinceKotlin(version = "1.1") @set:kotlin.SinceKotlin(version = "1.1") public var v5: kotlin.String
@kotlin.SinceKotlin(version = "1.1") public var v6: kotlin.String
@kotlin.SinceKotlin(version = "1.0") public val v7: kotlin.String
@kotlin.SinceKotlin(version = "1.0") @get:kotlin.SinceKotlin(version = "1.1") public val v7: kotlin.String
public fun test(): kotlin.Unit
@@ -2,7 +2,7 @@ package
public final class C {
public constructor C()
public final val foo: kotlin.String?
@get:kotlin.Suppress(names = {"warnings"}) public final val foo: 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
@@ -2,7 +2,7 @@ package
public final class C {
public constructor C()
public final val foo: kotlin.String?
@get:kotlin.Suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}) public final val foo: 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
@@ -2,7 +2,7 @@ package
public final class C {
public constructor C()
public final val foo: kotlin.String?
@get:kotlin.Suppress(names = {"REDUNDANT_NULLABLE"}) public final val foo: 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