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

compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.txt

@@ -2,5 +2,5 @@ package test
 
 public open class AnnotatedMethod {
     /*primary*/ public constructor AnnotatedMethod()
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open fun f(): kotlin.Unit
+    kotlin.deprecated(value = "Deprecated in Java") public open fun f(): kotlin.Unit
 }

compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt

@@ -1,6 +1,6 @@
 package test
 
-test.OptionGroups(o1 = test.StringOptions(option = {"abc", "d", "ef"}: kotlin.Array<out kotlin.String>): test.StringOptions, o2 = test.EnumOption(option = E.ENTRY: test.E): test.EnumOption) public final class AnnotationInAnnotationArguments {
+test.OptionGroups(o1 = test.StringOptions(option = {"abc", "d", "ef"}), o2 = test.EnumOption(option = E.ENTRY)) public final class AnnotationInAnnotationArguments {
     /*primary*/ public constructor AnnotationInAnnotationArguments()
 }
 

compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt

@@ -26,7 +26,7 @@ internal final annotation class EnumAnno : kotlin.Annotation {
 
 public final class EnumArgumentWithCustomToString {
     /*primary*/ public constructor EnumArgumentWithCustomToString()
-    test.EnumAnno(value = E.CAKE: test.E) test.EnumArrayAnno(value = {E.CAKE, E.CAKE}: kotlin.Array<out test.E>) internal final fun annotated(): kotlin.Unit
+    test.EnumAnno(value = E.CAKE) test.EnumArrayAnno(value = {E.CAKE, E.CAKE}) internal final fun annotated(): kotlin.Unit
 }
 
 internal final annotation class EnumArrayAnno : kotlin.Annotation {

compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.txt

@@ -7,7 +7,7 @@ internal final annotation class Anno : kotlin.Annotation {
 }
 
 internal interface T {
-    test.Anno(s = "bar": kotlin.String) internal abstract val bar: kotlin.Array<kotlin.Array<kotlin.BooleanArray>>
+    test.Anno(s = "bar") internal abstract val bar: kotlin.Array<kotlin.Array<kotlin.BooleanArray>>
         internal abstract fun <get-bar>(): kotlin.Array<kotlin.Array<kotlin.BooleanArray>>
-    test.Anno(s = "foo": kotlin.String) internal abstract fun foo(): kotlin.Array<kotlin.Array<kotlin.Array<test.T>>>
+    test.Anno(s = "foo") internal abstract fun foo(): kotlin.Array<kotlin.Array<kotlin.Array<test.T>>>
 }

compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.txt

@@ -7,5 +7,5 @@ internal final annotation class Anno : kotlin.Annotation {
 }
 
 internal final class Constructor {
-    /*primary*/ test.Anno(value = "string": kotlin.String) public constructor Constructor()
+    /*primary*/ test.Anno(value = "string") public constructor Constructor()
 }

compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt

@@ -8,8 +8,8 @@ internal final annotation class Anno : kotlin.Annotation {
 
 internal final class Class {
     /*primary*/ public constructor Class()
-    test.Anno(t = ElementType.FIELD: java.lang.annotation.ElementType) internal final var bar: kotlin.Int
+    test.Anno(t = ElementType.FIELD) internal final var bar: kotlin.Int
         internal final fun <get-bar>(): kotlin.Int
         internal final fun <set-bar>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
-    test.Anno(t = ElementType.METHOD: java.lang.annotation.ElementType) internal final fun foo(): kotlin.Unit
+    test.Anno(t = ElementType.METHOD) internal final fun foo(): kotlin.Unit
 }

compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt

@@ -1,17 +1,17 @@
 package test
 
-kotlin.deprecated(value = "Class": kotlin.String) internal final class Class {
+kotlin.deprecated(value = "Class") internal final class Class {
     /*primary*/ public constructor Class()
 
-    kotlin.deprecated(value = "companion object": kotlin.String) public companion object Companion {
+    kotlin.deprecated(value = "companion object") public companion object Companion {
         /*primary*/ private constructor Companion()
     }
 
-    kotlin.deprecated(value = "Inner": kotlin.String) internal final inner class Inner {
+    kotlin.deprecated(value = "Inner") internal final inner class Inner {
         /*primary*/ public constructor Inner()
     }
 
-    kotlin.deprecated(value = "Nested": kotlin.String) internal final class Nested {
+    kotlin.deprecated(value = "Nested") internal final class Nested {
         /*primary*/ public constructor Nested()
     }
 }

compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt

@@ -6,18 +6,18 @@ internal final annotation class Anno : kotlin.Annotation {
         internal final fun <get-t>(): java.lang.annotation.ElementType
 }
 
-test.Anno(t = ElementType.METHOD: java.lang.annotation.ElementType) internal final class Class {
+test.Anno(t = ElementType.METHOD) internal final class Class {
     /*primary*/ public constructor Class()
 
-    test.Anno(t = ElementType.ANNOTATION_TYPE: java.lang.annotation.ElementType) public companion object Companion {
+    test.Anno(t = ElementType.ANNOTATION_TYPE) public companion object Companion {
         /*primary*/ private constructor Companion()
     }
 
-    test.Anno(t = ElementType.PARAMETER: java.lang.annotation.ElementType) internal final inner class Inner {
+    test.Anno(t = ElementType.PARAMETER) internal final inner class Inner {
         /*primary*/ public constructor Inner()
     }
 
-    test.Anno(t = ElementType.TYPE: java.lang.annotation.ElementType) internal final class Nested {
+    test.Anno(t = ElementType.TYPE) internal final class Nested {
         /*primary*/ public constructor Nested()
     }
 }

compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.txt

@@ -1,5 +1,5 @@
 package test
 
-java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME: java.lang.annotation.RetentionPolicy) internal final annotation class Anno : kotlin.Annotation {
+java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME) internal final annotation class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno()
 }

compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.txt

@@ -18,7 +18,7 @@ internal final annotation class CharAnno : kotlin.Annotation {
         internal final fun <get-value>(): kotlin.Char
 }
 
-test.IntAnno(value = 42: kotlin.Int) test.ShortAnno(value = 42.toShort(): kotlin.Short) test.ByteAnno(value = 42.toByte(): kotlin.Byte) test.LongAnno(value = 42.toLong(): kotlin.Long) test.CharAnno(value = \u0041 ('A'): kotlin.Char) test.BooleanAnno(value = false: kotlin.Boolean) test.FloatAnno(value = 3.14.toFloat(): kotlin.Float) test.DoubleAnno(value = 3.14.toDouble(): kotlin.Double) internal final class Class {
+test.IntAnno(value = 42) test.ShortAnno(value = 42.toShort()) test.ByteAnno(value = 42.toByte()) test.LongAnno(value = 42.toLong()) test.CharAnno(value = \u0041 ('A')) test.BooleanAnno(value = false) test.FloatAnno(value = 3.14.toFloat()) test.DoubleAnno(value = 3.14.toDouble()) internal final class Class {
     /*primary*/ public constructor Class()
 }
 

compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.txt

@@ -10,6 +10,6 @@ internal final annotation class Anno : kotlin.Annotation {
         internal final fun <get-string>(): kotlin.String
 }
 
-test.Anno(double = 3.14.toDouble(): kotlin.Double, int = 42: kotlin.Int, string = "OK": kotlin.String) internal final class Class {
+test.Anno(double = 3.14.toDouble(), int = 42, string = "OK") internal final class Class {
     /*primary*/ public constructor Class()
 }

compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt

@@ -1,8 +1,8 @@
 package test
 
-test.Anno(t = ElementType.FIELD: java.lang.annotation.ElementType) internal val bar: kotlin.Int = 42
+test.Anno(t = ElementType.FIELD) internal val bar: kotlin.Int = 42
     internal fun <get-bar>(): kotlin.Int
-test.Anno(t = ElementType.METHOD: java.lang.annotation.ElementType) internal fun foo(): kotlin.Unit
+test.Anno(t = ElementType.METHOD) internal fun foo(): kotlin.Unit
 
 internal final annotation class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno(/*0*/ t: java.lang.annotation.ElementType)

compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt

@@ -1,9 +1,9 @@
 package test
 
-test.Anno(t = {ElementType.PACKAGE}: kotlin.Array<out java.lang.annotation.ElementType>) internal val bar: kotlin.Int = 42
+test.Anno(t = {ElementType.PACKAGE}) internal val bar: kotlin.Int = 42
     internal fun <get-bar>(): kotlin.Int
-test.Anno(t = {}: kotlin.Array<out java.lang.annotation.ElementType>) internal fun baz(): kotlin.Unit
-test.Anno(t = {ElementType.METHOD, ElementType.FIELD}: kotlin.Array<out java.lang.annotation.ElementType>) internal fun foo(): kotlin.Unit
+test.Anno(t = {}) internal fun baz(): kotlin.Unit
+test.Anno(t = {ElementType.METHOD, ElementType.FIELD}) internal fun foo(): kotlin.Unit
 
 internal final annotation class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno(/*0*/ vararg t: java.lang.annotation.ElementType /*kotlin.Array<out java.lang.annotation.ElementType>*/)

compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt

@@ -1,9 +1,9 @@
 package test
 
-test.Anno(t = {"prosper"}: kotlin.Array<out kotlin.String>) internal val bar: kotlin.Int = 42
+test.Anno(t = {"prosper"}) internal val bar: kotlin.Int = 42
     internal fun <get-bar>(): kotlin.Int
-test.Anno(t = {}: kotlin.Array<out kotlin.String>) internal fun baz(): kotlin.Unit
-test.Anno(t = {"live", "long"}: kotlin.Array<out kotlin.String>) internal fun foo(): kotlin.Unit
+test.Anno(t = {}) internal fun baz(): kotlin.Unit
+test.Anno(t = {"live", "long"}) internal fun foo(): kotlin.Unit
 
 internal final annotation class Anno : kotlin.Annotation {
     /*primary*/ public constructor Anno(/*0*/ vararg t: kotlin.String /*kotlin.Array<out kotlin.String>*/)

compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.txt

@@ -10,14 +10,14 @@ internal final class Outer {
     /*primary*/ public constructor Outer()
 
     internal final inner class Inner {
-        /*primary*/ public constructor Inner(/*0*/ test.A(s = "inner": kotlin.String) y: kotlin.String)
-        test.A(s = "inner": kotlin.String) internal final val y: kotlin.String
+        /*primary*/ public constructor Inner(/*0*/ test.A(s = "inner") y: kotlin.String)
+        test.A(s = "inner") internal final val y: kotlin.String
             internal final fun <get-y>(): kotlin.String
     }
 
     internal final class Nested {
-        /*primary*/ public constructor Nested(/*0*/ test.A(s = "nested": kotlin.String) x: kotlin.String)
-        test.A(s = "nested": kotlin.String) internal final val x: kotlin.String
+        /*primary*/ public constructor Nested(/*0*/ test.A(s = "nested") x: kotlin.String)
+        test.A(s = "nested") internal final val x: kotlin.String
             internal final fun <get-x>(): kotlin.String
     }
 }

compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt

@@ -10,5 +10,5 @@ internal final annotation class Ann : kotlin.Annotation {
 
 internal final class TypeAnnotationWithArguments {
     /*primary*/ public constructor TypeAnnotationWithArguments()
-    internal final fun foo(/*0*/ param: @[test.Ann(x = "param": kotlin.String, y = 3.14.toDouble(): kotlin.Double)] kotlin.IntRange): @[test.Ann(x = "fun": kotlin.String, y = 2.72.toDouble(): kotlin.Double)] kotlin.Unit
+    internal final fun foo(/*0*/ param: @[test.Ann(x = "param", y = 3.14.toDouble())] kotlin.IntRange): @[test.Ann(x = "fun", y = 2.72.toDouble())] kotlin.Unit
 }

compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt

@@ -9,27 +9,27 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date {
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any!
     public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: java.util.Date!): kotlin.Int
     invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarDate(): sun.util.calendar.BaseCalendar.Date!
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getDate(): kotlin.Int
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getDay(): kotlin.Int
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getHours(): kotlin.Int
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getMinutes(): kotlin.Int
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getMonth(): kotlin.Int
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getSeconds(): kotlin.Int
+    kotlin.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getDate(): kotlin.Int
+    kotlin.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getDay(): kotlin.Int
+    kotlin.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getHours(): kotlin.Int
+    kotlin.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getMinutes(): kotlin.Int
+    kotlin.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getMonth(): kotlin.Int
+    kotlin.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getSeconds(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun getTime(): kotlin.Long
     invisible_fake final override /*1*/ /*fake_override*/ fun getTimeImpl(): kotlin.Long
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getTimezoneOffset(): kotlin.Int
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getYear(): kotlin.Int
+    kotlin.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getTimezoneOffset(): kotlin.Int
+    kotlin.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getYear(): kotlin.Int
     invisible_fake final override /*1*/ /*fake_override*/ fun normalize(): sun.util.calendar.BaseCalendar.Date!
     invisible_fake final override /*1*/ /*fake_override*/ fun normalize(/*0*/ p0: sun.util.calendar.BaseCalendar.Date!): sun.util.calendar.BaseCalendar.Date!
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0: kotlin.Int): kotlin.Unit
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0: kotlin.Int): kotlin.Unit
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0: kotlin.Int): kotlin.Unit
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0: kotlin.Int): kotlin.Unit
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0: kotlin.Int): kotlin.Unit
+    kotlin.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0: kotlin.Int): kotlin.Unit
+    kotlin.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0: kotlin.Int): kotlin.Unit
+    kotlin.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0: kotlin.Int): kotlin.Unit
+    kotlin.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0: kotlin.Int): kotlin.Unit
+    kotlin.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0: kotlin.Long): kotlin.Unit
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: kotlin.Int): kotlin.Unit
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun toGMTString(): kotlin.String!
-    kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun toLocaleString(): kotlin.String!
+    kotlin.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: kotlin.Int): kotlin.Unit
+    kotlin.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toGMTString(): kotlin.String!
+    kotlin.deprecated(value = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toLocaleString(): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit
 }

compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.txt

@@ -1,6 +1,6 @@
 package test
 
 kotlin.inline() internal fun a(): kotlin.Unit
-kotlin.inline(strategy = InlineStrategy.AS_FUNCTION: kotlin.InlineStrategy) internal fun b(): kotlin.Unit
-kotlin.inline(strategy = InlineStrategy.IN_PLACE: kotlin.InlineStrategy) internal fun c(): kotlin.Unit
-kotlin.inline(strategy = InlineStrategy.IN_PLACE: kotlin.InlineStrategy) internal fun d(): kotlin.Unit
+kotlin.inline(strategy = InlineStrategy.AS_FUNCTION) internal fun b(): kotlin.Unit
+kotlin.inline(strategy = InlineStrategy.IN_PLACE) internal fun c(): kotlin.Unit
+kotlin.inline(strategy = InlineStrategy.IN_PLACE) internal fun d(): kotlin.Unit