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

2015-06-29 19:54:43 +03:00
parent dde295011b
commit bae9a7d7f8
213 changed files with 604 additions and 552 deletions
@@ -1,7 +1,7 @@
 package test

 public open class AnnotatedConstructor {
-    test.AnnotatedConstructor.Anno(value = "constructor": kotlin.String) public constructor AnnotatedConstructor()
+    test.AnnotatedConstructor.Anno(value = "constructor") public constructor AnnotatedConstructor()

    public final annotation class Anno : kotlin.Annotation {
        public constructor Anno(/*0*/ value: kotlin.String)
@@ -2,7 +2,7 @@ package test

 public open class AnnotatedField {
    public constructor AnnotatedField()
-    test.AnnotatedField.Anno(value = "member": kotlin.String) public final val y: kotlin.Int = 0
+    test.AnnotatedField.Anno(value = "member") public final val y: kotlin.Int = 0

    public final annotation class Anno : kotlin.Annotation {
        public constructor Anno(/*0*/ value: kotlin.String)
@@ -11,5 +11,5 @@ public open class AnnotatedField {
    }

    // Static members
-    test.AnnotatedField.Anno(value = "static": kotlin.String) public final val x: kotlin.Int = 0
+    test.AnnotatedField.Anno(value = "static") public final val x: kotlin.Int = 0
 }
@@ -2,7 +2,7 @@ package test

 public open class AnnotatedMethod {
    public constructor AnnotatedMethod()
-    test.AnnotatedMethod.Anno(value = 42: kotlin.Int) public open fun f(): kotlin.Unit
+    test.AnnotatedMethod.Anno(value = 42) public open fun f(): kotlin.Unit

    public final annotation class Anno : kotlin.Annotation {
        public constructor Anno(/*0*/ value: kotlin.Int)
@@ -2,7 +2,7 @@ package test

 public open class AnnotatedValueParameter {
    public constructor AnnotatedValueParameter()
-    public open fun f(/*0*/ test.AnnotatedValueParameter.Anno(value = "non-empty": kotlin.String) p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
+    public open fun f(/*0*/ test.AnnotatedValueParameter.Anno(value = "non-empty") p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit

    public final annotation class Anno : kotlin.Annotation {
        public constructor Anno(/*0*/ value: kotlin.String)
@@ -2,15 +2,15 @@ package test

 public interface AnnotationInParam {

-    test.AnnotationInParam.MyAnnotationWithParam(value = test.AnnotationInParam.MyAnnotation(value = "test": kotlin.String): test.AnnotationInParam.MyAnnotation) public open class A {
+    test.AnnotationInParam.MyAnnotationWithParam(value = test.AnnotationInParam.MyAnnotation(value = "test")) public open class A {
        public constructor A()
    }

-    test.AnnotationInParam.MyAnnotationWithParam2(value = test.AnnotationInParam.MyAnnotation2(value = {"test", "test2"}: kotlin.Array<out kotlin.String>): test.AnnotationInParam.MyAnnotation2) public open class B {
+    test.AnnotationInParam.MyAnnotationWithParam2(value = test.AnnotationInParam.MyAnnotation2(value = {"test", "test2"})) public open class B {
        public constructor B()
    }

-    test.AnnotationInParam.MyAnnotationWithParam3(value = test.AnnotationInParam.MyAnnotation3(first = "f": kotlin.String, second = "s": kotlin.String): test.AnnotationInParam.MyAnnotation3) public open class C {
+    test.AnnotationInParam.MyAnnotationWithParam3(value = test.AnnotationInParam.MyAnnotation3(first = "f", second = "s")) public open class C {
        public constructor C()
    }

@@ -9,7 +9,7 @@ public open class ArithmeticExpressionInParam {
        public abstract fun value(): kotlin.Int
    }

-    test.ArithmeticExpressionInParam.Anno(value = 42: kotlin.Int) public open class Class {
+    test.ArithmeticExpressionInParam.Anno(value = 42) public open class Class {
        public constructor Class()
    }
 }
@@ -2,7 +2,7 @@ package test

 public interface ArrayOfEnumInParam {

-    java.lang.annotation.Target(value = {ElementType.FIELD, ElementType.CONSTRUCTOR}: kotlin.Array<out java.lang.annotation.ElementType>) public final annotation class targetAnnotation : kotlin.Annotation {
+    java.lang.annotation.Target(value = {ElementType.FIELD, ElementType.CONSTRUCTOR}) public final annotation class targetAnnotation : kotlin.Annotation {
        public constructor targetAnnotation(/*0*/ value: kotlin.String)
        public final val value: kotlin.String
        public abstract fun value(): kotlin.String
@@ -2,7 +2,7 @@ package test

 public interface ArrayOfStringInParam {

-    test.ArrayOfStringInParam.MyAnnotation(value = {"a", "b", "c"}: kotlin.Array<out kotlin.String>) public open class A {
+    test.ArrayOfStringInParam.MyAnnotation(value = {"a", "b", "c"}) public open class A {
        public constructor A()
    }

@@ -9,7 +9,7 @@ public open class ClassObjectArrayInParam {
        public abstract fun value(): kotlin.Array<kotlin.reflect.KClass<*>>
    }

-    test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam::class, test.ClassObjectArrayInParam.Nested::class, kotlin.String::class}: kotlin.Array<out kotlin.reflect.KClass<*>>) public open class Nested {
+    test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam::class, test.ClassObjectArrayInParam.Nested::class, kotlin.String::class}) public open class Nested {
        public constructor Nested()
    }
 }
@@ -9,7 +9,7 @@ public open class ClassObjectInParam {
        public abstract fun value(): kotlin.reflect.KClass<*>
    }

-    test.ClassObjectInParam.Anno(value = test.ClassObjectInParam::class: java.lang.Class<test.ClassObjectInParam>) public open class Nested {
+    test.ClassObjectInParam.Anno(value = test.ClassObjectInParam::class) public open class Nested {
        public constructor Nested()
    }
 }
@@ -11,7 +11,7 @@ public open class ClassObjectInParamRaw {
        public abstract fun value(): kotlin.reflect.KClass<*>
    }

-    test.ClassObjectInParamRaw.Anno(arg = {}: kotlin.Array<kotlin.reflect.KClass<*>>, value = test.ClassObjectInParamRaw::class: java.lang.Class<test.ClassObjectInParamRaw>) public open class Nested {
+    test.ClassObjectInParamRaw.Anno(arg = {}, value = test.ClassObjectInParamRaw::class) public open class Nested {
        public constructor Nested()
    }
 }
@@ -26,7 +26,7 @@ public interface CustomAnnotation {
        public final /*synthesized*/ fun values(): kotlin.Array<test.CustomAnnotation.MyEnum>
    }

-    test.CustomAnnotation.MyAnnotation(value = MyEnum.ONE: test.CustomAnnotation.MyEnum) public open class MyTest {
+    test.CustomAnnotation.MyAnnotation(value = MyEnum.ONE) public open class MyTest {
        public constructor MyTest()
    }
 }
@@ -10,7 +10,7 @@ public interface CustomAnnotationWithDefaultParameter {
        public abstract fun second(): kotlin.String
    }

-    test.CustomAnnotationWithDefaultParameter.MyAnnotation(first = "f": kotlin.String, second = "s": kotlin.String) public open class MyTest {
+    test.CustomAnnotationWithDefaultParameter.MyAnnotation(first = "f", second = "s") public open class MyTest {
        public constructor MyTest()
    }
 }
@@ -2,7 +2,7 @@ package test

 public interface EmptyArrayInParam {

-    test.EmptyArrayInParam.MyAnnotation(value = {}: kotlin.Array<out kotlin.String>) public open class A {
+    test.EmptyArrayInParam.MyAnnotation(value = {}) public open class A {
        public constructor A()
    }

@@ -2,7 +2,7 @@ package test

 public open class EnumArgumentWithCustomToString {
    public constructor EnumArgumentWithCustomToString()
-    test.EnumArgumentWithCustomToString.EnumAnno(value = E.CAKE: test.EnumArgumentWithCustomToString.E) test.EnumArgumentWithCustomToString.EnumArrayAnno(value = {E.CAKE, E.CAKE}: kotlin.Array<out test.EnumArgumentWithCustomToString.E>) public/*package*/ open fun annotated(): kotlin.Unit
+    test.EnumArgumentWithCustomToString.EnumAnno(value = E.CAKE) test.EnumArgumentWithCustomToString.EnumArrayAnno(value = {E.CAKE, E.CAKE}) public/*package*/ open fun annotated(): kotlin.Unit

    public open enum class E : kotlin.Enum<test.EnumArgumentWithCustomToString.E!> {
        public enum entry CAKE : test.EnumArgumentWithCustomToString.E {
@@ -9,7 +9,7 @@ public final enum class EnumConstructorParameter : kotlin.Enum<test.EnumConstruc
    }

    private constructor EnumConstructorParameter(/*0*/ p0: kotlin.Int)
-    private constructor EnumConstructorParameter(/*0*/ test.EnumConstructorParameter.Anno(value = "string": kotlin.String) p0: kotlin.String!)
+    private constructor EnumConstructorParameter(/*0*/ test.EnumConstructorParameter.Anno(value = "string") p0: kotlin.String!)
    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumConstructorParameter!): kotlin.Int
    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
@@ -8,7 +8,7 @@ public interface EnumInParam {
        public abstract fun value(): java.lang.annotation.RetentionPolicy
    }

-    test.EnumInParam.MyRetention(value = RetentionPolicy.RUNTIME: java.lang.annotation.RetentionPolicy) public final annotation class RetentionAnnotation : kotlin.Annotation {
+    test.EnumInParam.MyRetention(value = RetentionPolicy.RUNTIME) public final annotation class RetentionAnnotation : kotlin.Annotation {
        public constructor RetentionAnnotation(/*0*/ value: kotlin.String)
        public final val value: kotlin.String
        public abstract fun value(): kotlin.String
@@ -2,7 +2,7 @@ package test

 public open class NestedEnumArgument {
    public constructor NestedEnumArgument()
-    test.NestedEnumArgument.Anno(value = E.FIRST: test.NestedEnumArgument.E) public/*package*/ open fun foo(): kotlin.Unit
+    test.NestedEnumArgument.Anno(value = E.FIRST) public/*package*/ open fun foo(): kotlin.Unit

    public final annotation class Anno : kotlin.Annotation {
        public constructor Anno(/*0*/ value: test.NestedEnumArgument.E)
@@ -2,7 +2,7 @@ package test

 public interface PrimitiveValueInParam {

-    test.PrimitiveValueInParam.Ann(bool = true: kotlin.Boolean, d = 1.0.toDouble(): kotlin.Double, f = 1.0.toFloat(): kotlin.Float, i = 1: kotlin.Int, l = 1.toLong(): kotlin.Long, str = "str": kotlin.String) public open class A {
+    test.PrimitiveValueInParam.Ann(bool = true, d = 1.0.toDouble(), f = 1.0.toFloat(), i = 1, l = 1.toLong(), str = "str") public open class A {
        public constructor A()
    }

@@ -2,13 +2,13 @@ package test

 public interface RecursiveAnnotation {

-    test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test": kotlin.String): test.RecursiveAnnotation.A) public final annotation class A : kotlin.Annotation {
+    test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test")) public final annotation class A : kotlin.Annotation {
        public constructor A(/*0*/ value: kotlin.String)
        public final val value: kotlin.String
        public abstract fun value(): kotlin.String
    }

-    test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test": kotlin.String): test.RecursiveAnnotation.A) public final annotation class B : kotlin.Annotation {
+    test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test")) public final annotation class B : kotlin.Annotation {
        public constructor B(/*0*/ value: test.RecursiveAnnotation.A)
        public final val value: test.RecursiveAnnotation.A
        public abstract fun value(): test.RecursiveAnnotation.A
@@ -8,7 +8,7 @@ public interface RecursiveAnnotation2 {
        public abstract fun value(): test.RecursiveAnnotation2.B
    }

-    test.RecursiveAnnotation2.A(value = test.RecursiveAnnotation2.B(value = "test": kotlin.String): test.RecursiveAnnotation2.B) public final annotation class B : kotlin.Annotation {
+    test.RecursiveAnnotation2.A(value = test.RecursiveAnnotation2.B(value = "test")) public final annotation class B : kotlin.Annotation {
        public constructor B(/*0*/ value: kotlin.String)
        public final val value: kotlin.String
        public abstract fun value(): kotlin.String
@@ -8,7 +8,7 @@ public interface StringConcatenationInParam {
        public abstract fun value(): kotlin.String
    }

-    test.StringConcatenationInParam.Anno(value = "hello": kotlin.String) public open class Class {
+    test.StringConcatenationInParam.Anno(value = "hello") public open class Class {
        public constructor Class()
    }
 }
@@ -8,7 +8,7 @@ public interface StringConstantInParam {
        public abstract fun value(): kotlin.String
    }

-    test.StringConstantInParam.Anno(value = "hello": kotlin.String) public open class Class {
+    test.StringConstantInParam.Anno(value = "hello") public open class Class {
        public constructor Class()
    }

@@ -8,7 +8,7 @@ public interface StringInParam {
        public abstract fun value(): kotlin.String
    }

-    test.StringInParam.Anno(value = "hello": kotlin.String) public open class Class {
+    test.StringInParam.Anno(value = "hello") public open class Class {
        public constructor Class()
    }
 }