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/tests/j+k/collectionOverrides/collectionStringImpl.txt
Vendored
+1 -1
View File
@@ -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
compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt
Vendored
+3 -3
View File
@@ -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
compiler/testData/diagnostics/tests/j+k/exceptionMessage.javac.txt
Vendored
+1 -1
View File
@@ -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!
compiler/testData/diagnostics/tests/j+k/exceptionMessage.txt
Vendored
+1 -1
View File
@@ -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!
compiler/testData/diagnostics/tests/j+k/kt1730_implementCharSequence.txt
Vendored
+2 -2
View File
@@ -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
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/specializedMap.txt
Vendored
+4 -4
View File
@@ -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