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/testsWithJsStdLib/name/illegalName.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public val x: kotlin.Int
@get:kotlin.js.JsName(name = ".") public val x: kotlin.Int
private fun ` .private `(): kotlin.String
@kotlin.js.JsName(name = "validName") private fun ` .private with @JsName `(): kotlin.String
public fun ` .public `(): kotlin.String
compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameMissingOnAccessors.txt
Vendored
+5 -5
View File
@@ -1,14 +1,14 @@
package
package foo {
public var xx: kotlin.Int
public var foo.A.ext: kotlin.Int
@get:kotlin.js.JsName(name = "get_xx") public var xx: kotlin.Int
@get:kotlin.js.JsName(name = "get_ext") public var foo.A.ext: kotlin.Int
public final class A {
public constructor A()
public final var x: kotlin.Int
public final var y: kotlin.Int
public final var z: kotlin.Int
@get:kotlin.js.JsName(name = "get_x") public final var x: kotlin.Int
@set:kotlin.js.JsName(name = "set_y") public final var y: kotlin.Int
@get:kotlin.js.JsName(name = "get_z") @set:kotlin.js.JsName(name = "set_z") public final var z: 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/testsWithJsStdLib/name/jsNameOnAccessors.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ package foo {
public final class A {
public constructor A()
public final var x: kotlin.Int
@get:kotlin.js.JsName(name = "xx") @set:kotlin.js.JsName(name = "xx") public final var x: 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/testsWithJsStdLib/name/jsNameOnOverride.txt
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@ package foo {
public open class A {
public constructor A()
@kotlin.js.JsName(name = "bar_") public open val bar: kotlin.Int = 123
public open val baz: kotlin.Int
@get:kotlin.js.JsName(name = "getBaz_") public open val baz: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.js.JsName(name = "foo_") public open fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -15,7 +15,7 @@ package foo {
public final class B : foo.A {
public constructor B()
@kotlin.js.JsName(name = "bar__") public open override /*1*/ val bar: kotlin.Int = 142
public open override /*1*/ val baz: kotlin.Int
@get:kotlin.js.JsName(name = "getBaz__") public open override /*1*/ val baz: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.js.JsName(name = "foo__") public open override /*1*/ fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnPropertyAndAccessor.txt
Vendored
+4 -4
View File
@@ -1,14 +1,14 @@
package
package foo {
@kotlin.js.JsName(name = "mm_") public var mm: kotlin.Int
@kotlin.js.JsName(name = "xx_") public val xx: kotlin.Int
@kotlin.js.JsName(name = "mm_") @get:kotlin.js.JsName(name = "get_mm") @set:kotlin.js.JsName(name = "set_mm") public var mm: kotlin.Int
@kotlin.js.JsName(name = "xx_") @get:kotlin.js.JsName(name = "get_xx") public val xx: kotlin.Int
@kotlin.js.JsName(name = "yy_") public val yy: kotlin.Int = 0
public final class A {
public constructor A()
@kotlin.js.JsName(name = "m_") public final var m: kotlin.Int
@kotlin.js.JsName(name = "x_") public final val x: kotlin.Int
@kotlin.js.JsName(name = "m_") @get:kotlin.js.JsName(name = "get_m") @set:kotlin.js.JsName(name = "set_m") public final var m: kotlin.Int
@kotlin.js.JsName(name = "x_") @get:kotlin.js.JsName(name = "get_x") public final val x: kotlin.Int
@kotlin.js.JsName(name = "y_") public final val y: 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
compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameUseTargetOnProperty.txt
Vendored
+2 -2
View File
@@ -2,8 +2,8 @@ package
public final class A {
public constructor A()
@kotlin.js.JsName(name = "x_") public final val x: kotlin.Int = 0
public final var y: kotlin.Int
@kotlin.js.JsName(name = "x_") @get:kotlin.js.JsName(name = "getX_") public final val x: kotlin.Int = 0
@get:kotlin.js.JsName(name = "getY_") public final var y: 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/testsWithJsStdLib/runtimeAnnotations.txt
Vendored
+6 -6
View File
@@ -3,7 +3,7 @@ package
@X public final external class A {
public constructor A()
@X public final val p: kotlin.Int
public final val r: kotlin.Int
@get:X public final val r: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@X public final fun f(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -13,7 +13,7 @@ package
@Y public final external class B {
public constructor B()
@Y public final val p: kotlin.Int
public final val r: kotlin.Int
@get:Y public final val r: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@Y public final fun f(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -23,8 +23,8 @@ package
@X public final class C {
public constructor C()
@X public final val p: kotlin.Int = 0
public final val q: kotlin.Int
public final val r: kotlin.Int = 0
@get:X public final val q: kotlin.Int
@get:X public final val r: kotlin.Int = 0
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@X public final fun f(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -34,8 +34,8 @@ package
@Y public final class D {
public constructor D()
@Y public final val p: kotlin.Int = 0
public final val q: kotlin.Int
public final val r: kotlin.Int = 0
@get:Y public final val q: kotlin.Int
@get:Y public final val r: kotlin.Int = 0
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@Y public final fun f(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int