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

Render property accessor annotations in .txt test data

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/annotations/JvmSyntheticOnDelegate.txt
Vendored
+2 -2
View File
@@ -3,8 +3,8 @@ package
public final class My {
public constructor My()
@delegate:kotlin.jvm.JvmSynthetic public final val s: kotlin.String
public final val t: kotlin.String
public final var z: kotlin.String
@get:kotlin.jvm.JvmSynthetic public final val t: kotlin.String
@set:kotlin.jvm.JvmSynthetic public final var z: 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
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/annotationsOnUseSiteTargets.txt
Vendored
+4 -4
View File
@@ -1,10 +1,10 @@
package
public interface Test {
public abstract val a: kotlin.Int
public abstract val b: kotlin.Int
public abstract val c: kotlin.Int
public abstract val d: kotlin.Int
@get:kotlin.jvm.JvmStatic public abstract val a: kotlin.Int
@get:kotlin.jvm.JvmName(name = "1") public abstract val b: kotlin.Int
@get:kotlin.jvm.Synchronized public abstract val c: kotlin.Int
@get:kotlin.jvm.JvmOverloads public abstract val d: 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
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.txt
Vendored
+6 -6
View File
@@ -1,9 +1,9 @@
package
@kotlin.jvm.JvmName(name = "c") public val px: kotlin.Int = 1
public val valx: kotlin.Int
public var vardef: kotlin.Int
public var varx: kotlin.Int
@get:kotlin.jvm.JvmName(name = "e") public val valx: kotlin.Int
@get:kotlin.jvm.JvmName(name = "h") @set:kotlin.jvm.JvmName(name = "i") public var vardef: kotlin.Int
@get:kotlin.jvm.JvmName(name = "f") @set:kotlin.jvm.JvmName(name = "g") public var varx: kotlin.Int
@kotlin.jvm.JvmName(name = "d") public val kotlin.Any.px: kotlin.Int
@kotlin.jvm.JvmName(name = "a") public fun foo(): kotlin.Unit
public fun foo1(): kotlin.Unit
@@ -23,8 +23,8 @@ public abstract class AB {
@kotlin.jvm.JvmName(name = "primary") public constructor C()
@kotlin.jvm.JvmName(name = "ctr") public constructor C(/*0*/ x: kotlin.Int)
@kotlin.jvm.JvmName(name = "c") public final val px: kotlin.Int = 1
public final val valx: kotlin.Int
public final var varx: kotlin.Int
@get:kotlin.jvm.JvmName(name = "e") public final val valx: kotlin.Int
@get:kotlin.jvm.JvmName(name = "f") @set:kotlin.jvm.JvmName(name = "g") public final var varx: kotlin.Int
@kotlin.jvm.JvmName(name = "d") public final val kotlin.Any.px: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.jvm.JvmName(name = "a") public final fun foo(): kotlin.Unit
@@ -45,7 +45,7 @@ public final class D : AB {
}
public interface Intf {
public abstract var foo: kotlin.Int
@get:kotlin.jvm.JvmName(name = "getBar") @set:kotlin.jvm.JvmName(name = "setBar") public abstract var foo: 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
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsTargetingNonExistentAccessor.txt
Vendored
+24 -24
View File
@@ -24,16 +24,16 @@ public final class CustomDelegate {
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
@get:Ann public final val x0: kotlin.Int
@get:Ann protected final val x1: kotlin.Int
@get:Ann 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
@get:Ann 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
@@ -42,17 +42,17 @@ private final class EffetivelyPrivate {
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
@get:Ann private final val x1: kotlin.String = ""
@set:Ann 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>
@get:Ann internal final val x5: kotlin.String = ""
@get:Ann protected final val x6: kotlin.String = ""
@get:Ann @get:AnnRepeat private final val x7: kotlin.String = ""
@get:Ann @set:Ann private final var x8: kotlin.String
@get:Ann @set:Ann private final var x9: kotlin.String
@get:Ann private final val y0: kotlin.Int
@get:Ann 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
@@ -60,7 +60,7 @@ public final class Foo {
private final class Other {
public constructor Other(/*0*/ @Ann param: kotlin.Int)
@delegate:Ann private final val delegate: kotlin.String
@delegate:Ann @get: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
@@ -71,7 +71,7 @@ private final class Other {
public final class PrivateToThis</*0*/ in I> {
public constructor PrivateToThis</*0*/ in I>()
@setparam:Ann private/*private to this*/ final var x0: I
@get:Ann @set:Ann @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
@@ -86,19 +86,19 @@ public final class PrivateToThis</*0*/ in I> {
public final class Statics {
public constructor Statics()
public final lateinit var y0: kotlin.String
private final lateinit var y1: kotlin.String
@get:Ann public final lateinit var y0: kotlin.String
@get:Ann 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 = ""
@field:kotlin.jvm.JvmField @get:Ann public final val x0: kotlin.String = ""
@get:Ann public const final val x1: kotlin.String = ""
@kotlin.jvm.JvmStatic @get:Ann public final val x2: kotlin.String = ""
@kotlin.jvm.JvmStatic @get:Ann private final val x3: kotlin.String = ""
@kotlin.jvm.JvmStatic @get:Ann 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
@@ -107,8 +107,8 @@ public final class Statics {
public final class WithSource {
public constructor WithSource()
@setparam:SourceAnn private final var x0: kotlin.String
private final val x1: kotlin.String = ""
@get:SourceAnn @set:SourceAnn @setparam:SourceAnn private final var x0: kotlin.String
@get:SourceAnn 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
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
package
public interface B {
@kotlin.jvm.JvmDefault public open val prop1: kotlin.String
public open var prop2: kotlin.String
@kotlin.jvm.JvmDefault @get:kotlin.jvm.JvmDefault public open val prop1: kotlin.String
@get:kotlin.jvm.JvmDefault @set:kotlin.jvm.JvmDefault public open var prop2: 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
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/jvmFieldApplicability.txt
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ package
@kotlin.jvm.JvmField public abstract val c: kotlin.Int
@field:kotlin.jvm.JvmField public final val customGetter: kotlin.String = ""
@field:kotlin.jvm.JvmField public final var customSetter: kotlin.String
@field:kotlin.jvm.JvmField public final val explicitDefaultAnnotatedGetter: kotlin.String = ""
@field:kotlin.jvm.JvmField public final var explicitDefaultAnnotatedSetter: kotlin.String
@field:kotlin.jvm.JvmField @get:DemoAnnotation public final val explicitDefaultAnnotatedGetter: kotlin.String = ""
@field:kotlin.jvm.JvmField @set:DemoAnnotation public final var explicitDefaultAnnotatedSetter: kotlin.String
@field:kotlin.jvm.JvmField public final val explicitDefaultGetter: kotlin.String = ""
@field:kotlin.jvm.JvmField public final var explicitDefaultSetter: kotlin.String
@kotlin.jvm.JvmField public final val noBackingField: kotlin.String
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL12.txt
Vendored
+3 -3
View File
@@ -14,9 +14,9 @@ public interface B {
@kotlin.jvm.JvmStatic protected final var foo4: kotlin.Int
@kotlin.jvm.JvmStatic protected final var foo5: kotlin.Int
@kotlin.jvm.JvmStatic public final val foo6: kotlin.Int = 1
public final val foo7: kotlin.Int = 1
private final var foo8: kotlin.Int
public final var foo9: kotlin.Int
@get:kotlin.jvm.JvmStatic public final val foo7: kotlin.Int = 1
@set:kotlin.jvm.JvmStatic private final var foo8: kotlin.Int
@set:kotlin.jvm.JvmStatic public final var foo9: kotlin.Int
@kotlin.jvm.JvmStatic public final fun a1(): kotlin.Unit
@kotlin.jvm.JvmStatic private final fun a2(): kotlin.Unit
@kotlin.jvm.JvmStatic protected final fun a3(): kotlin.Unit
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.txt
Vendored
+3 -3
View File
@@ -14,9 +14,9 @@ public interface B {
@kotlin.jvm.JvmStatic protected final var foo4: kotlin.Int
@kotlin.jvm.JvmStatic protected final var foo5: kotlin.Int
@kotlin.jvm.JvmStatic public final val foo6: kotlin.Int = 1
public final val foo7: kotlin.Int = 1
private final var foo8: kotlin.Int
public final var foo9: kotlin.Int
@get:kotlin.jvm.JvmStatic public final val foo7: kotlin.Int = 1
@set:kotlin.jvm.JvmStatic private final var foo8: kotlin.Int
@set:kotlin.jvm.JvmStatic public final var foo9: kotlin.Int
@kotlin.jvm.JvmStatic public final fun a1(): kotlin.Unit
@kotlin.jvm.JvmStatic private final fun a2(): kotlin.Unit
@kotlin.jvm.JvmStatic protected final fun a3(): kotlin.Unit
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_18.txt
Vendored
+3 -3
View File
@@ -14,9 +14,9 @@ public interface B {
@kotlin.jvm.JvmStatic protected final var foo4: kotlin.Int
@kotlin.jvm.JvmStatic protected final var foo5: kotlin.Int
@kotlin.jvm.JvmStatic public final val foo6: kotlin.Int = 1
public final val foo7: kotlin.Int = 1
private final var foo8: kotlin.Int
public final var foo9: kotlin.Int
@get:kotlin.jvm.JvmStatic public final val foo7: kotlin.Int = 1
@set:kotlin.jvm.JvmStatic private final var foo8: kotlin.Int
@set:kotlin.jvm.JvmStatic public final var foo9: kotlin.Int
@kotlin.jvm.JvmStatic public final fun a1(): kotlin.Unit
@kotlin.jvm.JvmStatic private final fun a2(): kotlin.Unit
@kotlin.jvm.JvmStatic protected final fun a3(): kotlin.Unit
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.txt
Vendored
+5 -5
View File
@@ -2,7 +2,7 @@ package
public final class A {
public constructor A()
public final var p: kotlin.Int
@set:kotlin.jvm.JvmStatic public final var p: kotlin.Int
@kotlin.jvm.JvmStatic public final val z2: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -11,8 +11,8 @@ public final class A {
public object A : B {
private constructor A()
@kotlin.jvm.JvmStatic public open override /*1*/ val base1: kotlin.Int = 0
public open override /*1*/ val base2: kotlin.Int = 0
public final var p: kotlin.Int
@get:kotlin.jvm.JvmStatic public open override /*1*/ val base2: kotlin.Int = 0
@set:kotlin.jvm.JvmStatic public final var p: kotlin.Int
@kotlin.jvm.JvmStatic public final val z: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.jvm.JvmStatic public open fun f(): kotlin.Unit
@@ -23,8 +23,8 @@ public final class A {
public companion object Companion : B {
private constructor Companion()
@kotlin.jvm.JvmStatic public open override /*1*/ val base1: kotlin.Int = 0
public open override /*1*/ val base2: kotlin.Int = 0
public final var p1: kotlin.Int
@get:kotlin.jvm.JvmStatic public open override /*1*/ val base2: kotlin.Int = 0
@set:kotlin.jvm.JvmStatic public final var p1: kotlin.Int
@kotlin.jvm.JvmStatic public final val z: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property_LL13.txt
Vendored
+5 -5
View File
@@ -2,7 +2,7 @@ package
public final class A {
public constructor A()
public final var p: kotlin.Int
@set:kotlin.jvm.JvmStatic public final var p: kotlin.Int
@kotlin.jvm.JvmStatic public final val z2: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -11,8 +11,8 @@ public final class A {
public object A : B {
private constructor A()
@kotlin.jvm.JvmStatic public open override /*1*/ val base1: kotlin.Int = 0
public open override /*1*/ val base2: kotlin.Int = 0
public final var p: kotlin.Int
@get:kotlin.jvm.JvmStatic public open override /*1*/ val base2: kotlin.Int = 0
@set:kotlin.jvm.JvmStatic public final var p: kotlin.Int
@kotlin.jvm.JvmStatic public final val z: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.jvm.JvmStatic public open fun f(): kotlin.Unit
@@ -23,8 +23,8 @@ public final class A {
public companion object Companion : B {
private constructor Companion()
@kotlin.jvm.JvmStatic public open override /*1*/ val base1: kotlin.Int = 0
public open override /*1*/ val base2: kotlin.Int = 0
public final var p1: kotlin.Int
@get:kotlin.jvm.JvmStatic public open override /*1*/ val base2: kotlin.Int = 0
@set:kotlin.jvm.JvmStatic public final var p1: kotlin.Int
@kotlin.jvm.JvmStatic public final val z: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int