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

Types are no more rendered for annotation arguments + a swarm of tests corrected accordingly

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-06-29 19:54:43 +03:00
parent dde295011b
commit bae9a7d7f8
213 changed files with 604 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.txt
Vendored
+4 -4
View File
@@ -1,13 +1,13 @@
package
package a {
java.lang.Deprecated() java.lang.SuppressWarnings(value = {}: kotlin.Array<out kotlin.String>) internal val s: kotlin.String = ""
java.lang.Deprecated() java.lang.SuppressWarnings(value = {}: kotlin.Array<out kotlin.String>) internal fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
java.lang.Deprecated() java.lang.SuppressWarnings(value = {}) internal val s: kotlin.String = ""
java.lang.Deprecated() java.lang.SuppressWarnings(value = {}) internal fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
internal final class Test {
public constructor Test(/*0*/ java.lang.Deprecated() s: kotlin.String, /*1*/ java.lang.SuppressWarnings(value = {}: kotlin.Array<out kotlin.String>) x: kotlin.Int)
public constructor Test(/*0*/ java.lang.Deprecated() s: kotlin.String, /*1*/ java.lang.SuppressWarnings(value = {}) x: kotlin.Int)
java.lang.Deprecated() internal final val s: kotlin.String
java.lang.SuppressWarnings(value = {}: kotlin.Array<out kotlin.String>) internal final val x: kotlin.Int
java.lang.SuppressWarnings(value = {}) internal final val 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/tests/annotations/AnnotatedResultType.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
internal fun foo(): @[My(x = IntegerValueType(42): IntegerValueType(42))] kotlin.Int
internal fun foo(): @[My(x = IntegerValueType(42))] kotlin.Int
internal final annotation class My : kotlin.Annotation {
public constructor My(/*0*/ x: kotlin.Int)
compiler/testData/diagnostics/tests/annotations/AnnotationOnObject.txt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ package test {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
test.A(a = IntegerValueType(12): IntegerValueType(12), c = "Hello": kotlin.String) internal object SomeObject {
test.A(a = IntegerValueType(12), c = "Hello") internal object SomeObject {
private constructor SomeObject()
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/tests/annotations/BasicAnnotations.txt
Vendored
+2 -2
View File
@@ -2,10 +2,10 @@ package
my() internal fun foo(): kotlin.Unit
my1() internal fun foo2(): kotlin.Unit
my1(i = IntegerValueType(2): IntegerValueType(2)) internal fun foo3(): kotlin.Unit
my1(i = IntegerValueType(2)) internal fun foo3(): kotlin.Unit
my2() internal fun foo4(): kotlin.Unit
my2() internal fun foo41(): kotlin.Unit
my2(i = IntegerValueType(2): IntegerValueType(2)) internal fun foo42(): kotlin.Unit
my2(i = IntegerValueType(2)) internal fun foo42(): kotlin.Unit
internal final annotation class my : kotlin.Annotation {
public constructor my()
compiler/testData/diagnostics/tests/annotations/ConstructorCall.txt
Vendored
+3 -3
View File
@@ -1,7 +1,7 @@
package
Ann2(a = Ann1(a = IntegerValueType(1): IntegerValueType(1)): Ann1) internal val a: kotlin.Int = 1
Ann2(a = Ann1(a = IntegerValueType(1): IntegerValueType(1)): Ann1) internal val c: kotlin.Int = 2
Ann2(a = Ann1(a = IntegerValueType(1))) internal val a: kotlin.Int = 1
Ann2(a = Ann1(a = IntegerValueType(1))) internal val c: kotlin.Int = 2
internal fun bar(/*0*/ a: Ann = ...): kotlin.Unit
internal fun foo(): kotlin.Unit
internal fun </*0*/ T> javaClass(): java.lang.Class<T>
@@ -46,7 +46,7 @@ internal final annotation class Ann4 : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
Ann4(value = "a": kotlin.String) internal final class MyClass {
Ann4(value = "a") internal final class MyClass {
public constructor MyClass()
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/tests/annotations/JavaAnnotationConstructors.txt
Vendored
+2 -2
View File
@@ -1,13 +1,13 @@
package
java.lang.annotation.Retention(value = RetentionPolicy.CLASS: java.lang.annotation.RetentionPolicy) internal final annotation class my : kotlin.Annotation {
java.lang.annotation.Retention(value = RetentionPolicy.CLASS) internal final annotation class my : kotlin.Annotation {
public constructor my()
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
}
java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME: java.lang.annotation.RetentionPolicy) java.lang.annotation.Target(value = {ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR}: kotlin.Array<out java.lang.annotation.ElementType>) internal final annotation class my1 : kotlin.Annotation {
java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME) java.lang.annotation.Target(value = {ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR}) internal final annotation class my1 : kotlin.Annotation {
public constructor my1()
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/tests/annotations/RecursivelyAnnotated.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
RecursivelyAnnotated(x = IntegerValueType(1): IntegerValueType(1)) internal final annotation class RecursivelyAnnotated : kotlin.Annotation {
RecursivelyAnnotated(x = IntegerValueType(1)) internal final annotation class RecursivelyAnnotated : kotlin.Annotation {
public constructor RecursivelyAnnotated(/*0*/ x: kotlin.Int)
internal final val x: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalProperty.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
ann(x = 1: kotlin.Int) internal val x: kotlin.Int = 1
ann(x = 1) internal val x: kotlin.Int = 1
internal final annotation class ann : kotlin.Annotation {
public constructor ann(/*0*/ x: kotlin.Int)
compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameter.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
package
internal final annotation class RecursivelyAnnotated : kotlin.Annotation {
public constructor RecursivelyAnnotated(/*0*/ RecursivelyAnnotated(x = IntegerValueType(1): IntegerValueType(1)) x: kotlin.Int)
RecursivelyAnnotated(x = IntegerValueType(1): IntegerValueType(1)) internal final val x: kotlin.Int
public constructor RecursivelyAnnotated(/*0*/ RecursivelyAnnotated(x = IntegerValueType(1)) x: kotlin.Int)
RecursivelyAnnotated(x = IntegerValueType(1)) internal final val 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/tests/annotations/RecursivelyAnnotatedParameterType.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
package
internal final annotation class RecursivelyAnnotated : kotlin.Annotation {
public constructor RecursivelyAnnotated(/*0*/ x: @[RecursivelyAnnotated(x = IntegerValueType(1): IntegerValueType(1))] kotlin.Int)
internal final val x: @[RecursivelyAnnotated(x = IntegerValueType(1): IntegerValueType(1))] kotlin.Int
public constructor RecursivelyAnnotated(/*0*/ x: @[RecursivelyAnnotated(x = IntegerValueType(1))] kotlin.Int)
internal final val x: @[RecursivelyAnnotated(x = IntegerValueType(1))] 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/tests/annotations/RecursivelyAnnotatedParameterWithAt.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
package
internal final annotation class RecursivelyAnnotated : kotlin.Annotation {
public constructor RecursivelyAnnotated(/*0*/ RecursivelyAnnotated(x = IntegerValueType(1): IntegerValueType(1)) x: kotlin.Int)
RecursivelyAnnotated(x = IntegerValueType(1): IntegerValueType(1)) internal final val x: kotlin.Int
public constructor RecursivelyAnnotated(/*0*/ RecursivelyAnnotated(x = IntegerValueType(1)) x: kotlin.Int)
RecursivelyAnnotated(x = IntegerValueType(1)) internal final val 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/tests/annotations/RecursivelyAnnotatedProperty.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package
internal final class My {
public constructor My()
ann(x = 1: kotlin.Int) internal final val x: kotlin.Int = 1
ann(x = 1) internal final val x: 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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/annotations/RecursivelyIncorrectlyAnnotatedParameter.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
package
internal final class RecursivelyAnnotated {
public constructor RecursivelyAnnotated(/*0*/ RecursivelyAnnotated(x = IntegerValueType(1): IntegerValueType(1)) x: kotlin.Int)
RecursivelyAnnotated(x = IntegerValueType(1): IntegerValueType(1)) internal final val x: kotlin.Int
public constructor RecursivelyAnnotated(/*0*/ RecursivelyAnnotated(x = IntegerValueType(1)) x: kotlin.Int)
RecursivelyAnnotated(x = IntegerValueType(1)) internal final val 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/tests/annotations/WrongAnnotationArgsOnObject.txt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ package test {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
test.BadAnnotation(s = IntegerValueType(1): IntegerValueType(1)) internal object SomeObject {
test.BadAnnotation(s = IntegerValueType(1)) internal object SomeObject {
private constructor SomeObject()
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/tests/annotations/annotationParameterMustBeConstant/javaProperties.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
Ann(i = {1, 1, 1}: kotlin.IntArray) internal final class A {
Ann(i = {1, 1, 1}) internal final class A {
public constructor A()
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/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.txt
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ internal final annotation class Ann : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
Ann(i = {1, 1}: kotlin.IntArray) internal final class Test {
Ann(i = {1, 1}) internal final class Test {
public constructor Test()
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/tests/annotations/atAnnotationResolve.txt
Vendored
+3 -3
View File
@@ -1,11 +1,11 @@
package
Ann(x = IntegerValueType(1): IntegerValueType(1)) Ann(x = IntegerValueType(2): IntegerValueType(2)) Ann(x = IntegerValueType(3): IntegerValueType(3)) private final class A {
Ann(x = IntegerValueType(1)) Ann(x = IntegerValueType(2)) Ann(x = IntegerValueType(3)) private final class A {
Ann() public constructor A()
Ann() internal final val x: kotlin.Int = 1
internal final fun bar(/*0*/ x: @[Ann(x = IntegerValueType(1): IntegerValueType(1)) Ann(x = IntegerValueType(2): IntegerValueType(2)) Ann(x = IntegerValueType(3): IntegerValueType(3))] kotlin.Int): kotlin.Unit
internal final fun bar(/*0*/ x: @[Ann(x = IntegerValueType(1)) Ann(x = IntegerValueType(2)) Ann(x = IntegerValueType(3))] kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
Ann(x = IntegerValueType(5): IntegerValueType(5)) internal final fun foo(): kotlin.Unit
Ann(x = IntegerValueType(5)) internal final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}