Use DescriptorRenderer to render annotations everywhere

compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt

@@ -2,15 +2,15 @@ package test
 
 public trait AnnotationInParam : java.lang.Object {
     
-    test.AnnotationInParam.MyAnnotationWithParam(value = MyAnnotation[value = "test"]: test.AnnotationInParam.MyAnnotation) public open class A : java.lang.Object {
+    test.AnnotationInParam.MyAnnotationWithParam(value = test.AnnotationInParam.MyAnnotation(value = "test": jet.String): test.AnnotationInParam.MyAnnotation) public open class A : java.lang.Object {
         public constructor A()
     }
     
-    test.AnnotationInParam.MyAnnotationWithParam2(value = MyAnnotation2[value = ["test", "test2"]]: test.AnnotationInParam.MyAnnotation2) public open class B : java.lang.Object {
+    test.AnnotationInParam.MyAnnotationWithParam2(value = test.AnnotationInParam.MyAnnotation2(value = {"test", "test2"}: jet.Array<jet.String>?): test.AnnotationInParam.MyAnnotation2) public open class B : java.lang.Object {
         public constructor B()
     }
     
-    test.AnnotationInParam.MyAnnotationWithParam3(value = MyAnnotation3[first = "f", second = "s"]: test.AnnotationInParam.MyAnnotation3) public open class C : java.lang.Object {
+    test.AnnotationInParam.MyAnnotationWithParam3(value = test.AnnotationInParam.MyAnnotation3(first = "f": jet.String, second = "s": jet.String): test.AnnotationInParam.MyAnnotation3) public open class C : java.lang.Object {
         public constructor C()
     }
     

compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt

@@ -2,7 +2,7 @@ package test
 
 public trait ArrayOfEnumInParam : java.lang.Object {
     
-    java.lang.annotation.Target(value = [ElementType.FIELD, ElementType.CONSTRUCTOR]: jet.Array<java.lang.annotation.ElementType>?) public final annotation class targetAnnotation : jet.Annotation {
+    java.lang.annotation.Target(value = {ElementType.FIELD, ElementType.CONSTRUCTOR}: jet.Array<java.lang.annotation.ElementType>?) public final annotation class targetAnnotation : jet.Annotation {
         public constructor targetAnnotation(/*0*/ value: jet.String?)
         public abstract fun value(): jet.String?
     }

compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt

@@ -2,7 +2,7 @@ package test
 
 public trait ArrayOfStringInParam : java.lang.Object {
     
-    test.ArrayOfStringInParam.MyAnnotation(value = ["a", "b", "c"]: jet.Array<jet.String>?) public open class A : java.lang.Object {
+    test.ArrayOfStringInParam.MyAnnotation(value = {"a", "b", "c"}: jet.Array<jet.String>?) public open class A : java.lang.Object {
         public constructor A()
     }
     

compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt

@@ -8,7 +8,7 @@ public open class ClassObjectArrayInParam : java.lang.Object {
         public abstract fun value(): jet.Array<java.lang.Class<out jet.Any?>>?
     }
     
-    test.ClassObjectArrayInParam.Anno(value = [ClassObjectArrayInParam?.class, Nested?.class, String?.class]: jet.Array<java.lang.Class<out jet.Any?>>?) public open class Nested : java.lang.Object {
+    test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam?.class, test.ClassObjectArrayInParam.Nested?.class, jet.String?.class}: jet.Array<java.lang.Class<out jet.Any?>>?) public open class Nested : java.lang.Object {
         public constructor Nested()
     }
 }

compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt

@@ -8,7 +8,7 @@ public open class ClassObjectInParam : java.lang.Object {
         public abstract fun value(): java.lang.Class<out jet.Any?>?
     }
     
-    test.ClassObjectInParam.Anno(value = ClassObjectInParam?.class: java.lang.Class<test.ClassObjectInParam?>) public open class Nested : java.lang.Object {
+    test.ClassObjectInParam.Anno(value = test.ClassObjectInParam?.class: java.lang.Class<test.ClassObjectInParam?>) public open class Nested : java.lang.Object {
         public constructor Nested()
     }
 }

compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt

@@ -2,7 +2,7 @@ package test
 
 public trait EmptyArrayInParam : java.lang.Object {
     
-    test.EmptyArrayInParam.MyAnnotation(value = []: jet.Array<jet.String>?) public open class A : java.lang.Object {
+    test.EmptyArrayInParam.MyAnnotation(value = {}: jet.Array<jet.String>?) public open class A : java.lang.Object {
         public constructor A()
     }
     

compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt

@@ -2,12 +2,12 @@ package test
 
 public trait RecursiveAnnotation : java.lang.Object {
     
-    test.RecursiveAnnotation.B(value = A[value = "test"]: test.RecursiveAnnotation.A) public final annotation class A : jet.Annotation {
+    test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test": jet.String): test.RecursiveAnnotation.A) public final annotation class A : jet.Annotation {
         public constructor A(/*0*/ value: jet.String?)
         public abstract fun value(): jet.String?
     }
     
-    test.RecursiveAnnotation.B(value = A[value = "test"]: test.RecursiveAnnotation.A) public final annotation class B : jet.Annotation {
+    test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test": jet.String): test.RecursiveAnnotation.A) public final annotation class B : jet.Annotation {
         public constructor B(/*0*/ value: test.RecursiveAnnotation.A?)
         public abstract fun value(): test.RecursiveAnnotation.A?
     }

compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt

@@ -7,7 +7,7 @@ public trait RecursiveAnnotation2 : java.lang.Object {
         public abstract fun value(): test.RecursiveAnnotation2.B?
     }
     
-    test.RecursiveAnnotation2.A(value = B[value = "test"]: test.RecursiveAnnotation2.B) public final annotation class B : jet.Annotation {
+    test.RecursiveAnnotation2.A(value = test.RecursiveAnnotation2.B(value = "test": jet.String): test.RecursiveAnnotation2.B) public final annotation class B : jet.Annotation {
         public constructor B(/*0*/ value: jet.String?)
         public abstract fun value(): jet.String?
     }

compiler/testData/resolveAnnotations/parameters/byte.kt

@@ -9,4 +9,4 @@ annotation class Ann(
 
 Ann(1, 1.toByte(), 128.toByte(), 128) class MyClass
 
-// EXPECTED: Ann[b1 = IntegerValueType(1): IntegerValueType(1), b2 = 1.toByte(): jet.Byte, b3 = -128.toByte(): jet.Byte, b4 = IntegerValueType(128): IntegerValueType(128)]
+// EXPECTED: Ann(b1 = IntegerValueType(1): IntegerValueType(1), b2 = 1.toByte(): Byte, b3 = -128.toByte(): Byte, b4 = IntegerValueType(128): IntegerValueType(128))

compiler/testData/resolveAnnotations/parameters/char.kt

@@ -13,4 +13,4 @@ annotation class Ann(
 
 Ann('c', 99.toChar(), 'c'.toInt(), 'c'.toLong(), 'c'.toByte(), 'c'.toShort(), 'c'.toDouble(), 'c'.toFloat()) class MyClass
 
-// EXPECTED: Ann[b1 = #99(c): jet.Char, b2 = #99(c): jet.Char, b3 = 99.toInt(): jet.Int, b4 = 99.toLong(): jet.Long, b5 = 99.toByte(): jet.Byte, b6 = 99.toShort(): jet.Short, b7 = 99.0.toDouble(): jet.Double, b8 = 99.0.toFloat(): jet.Float]
+// EXPECTED: Ann(b1 = #99(c): Char, b2 = #99(c): Char, b3 = 99.toInt(): Int, b4 = 99.toLong(): Long, b5 = 99.toByte(): Byte, b6 = 99.toShort(): Short, b7 = 99.0.toDouble(): Double, b8 = 99.0.toFloat(): Float)

compiler/testData/resolveAnnotations/parameters/double.kt

@@ -9,4 +9,4 @@ annotation class Ann(
 
 Ann(1.0, 1.toDouble(), 1.7976931348623157E309.toDouble(), 1.7976931348623157E309) class MyClass
 
-// EXPECTED: Ann[b1 = 1.0.toDouble(): jet.Double, b2 = 1.0.toDouble(): jet.Double, b3 = Infinity.toDouble(): jet.Double, b4 = Infinity.toDouble(): jet.Double]
+// EXPECTED: Ann(b1 = 1.0.toDouble(): Double, b2 = 1.0.toDouble(): Double, b3 = Infinity.toDouble(): Double, b4 = Infinity.toDouble(): Double)

compiler/testData/resolveAnnotations/parameters/expressions/andAnd.kt

@@ -7,4 +7,4 @@ annotation class Ann(
 
 Ann(true && false, true && true) class MyClass
 
-// EXPECTED: Ann[b1 = false: jet.Boolean, b2 = true: jet.Boolean]
+// EXPECTED: Ann(b1 = false: Boolean, b2 = true: Boolean)

compiler/testData/resolveAnnotations/parameters/expressions/boolean.kt

@@ -8,4 +8,4 @@ annotation class Ann(
 
 Ann(true and false, false or true, true xor false) class MyClass
 
-// EXPECTED: Ann[b1 = false: jet.Boolean, b2 = true: jet.Boolean, b3 = true: jet.Boolean]
+// EXPECTED: Ann(b1 = false: Boolean, b2 = true: Boolean, b3 = true: Boolean)

compiler/testData/resolveAnnotations/parameters/expressions/char.kt

@@ -4,4 +4,4 @@ annotation class Ann(val c1: Char)
 
 Ann('a' - 'a') class MyClass
 
-// EXPECTED: Ann[c1 = IntegerValueType(0): IntegerValueType(0)]
+// EXPECTED: Ann(c1 = IntegerValueType(0): IntegerValueType(0))

compiler/testData/resolveAnnotations/parameters/expressions/compositeCallBinary.kt

@@ -8,4 +8,4 @@ annotation class Ann(
 
 Ann(1.toInt().plus(1), 1.minus(1.toInt()), 1.toInt().times(1.toInt())) class MyClass
 
-// EXPECTED: Ann[p1 = 2.toInt(): jet.Int, p2 = 0.toInt(): jet.Int, p3 = 1.toInt(): jet.Int]
+// EXPECTED: Ann(p1 = 2.toInt(): Int, p2 = 0.toInt(): Int, p3 = 1.toInt(): Int)

compiler/testData/resolveAnnotations/parameters/expressions/divide.kt

@@ -9,4 +9,4 @@ annotation class Ann(
 
 Ann(1 / 1, 1 / 1, 1 / 1, 1 / 1) class MyClass
 
-// EXPECTED: Ann[b = IntegerValueType(1): IntegerValueType(1), i = IntegerValueType(1): IntegerValueType(1), l = IntegerValueType(1): IntegerValueType(1), s = IntegerValueType(1): IntegerValueType(1)]
+// EXPECTED: Ann(b = IntegerValueType(1): IntegerValueType(1), i = IntegerValueType(1): IntegerValueType(1), l = IntegerValueType(1): IntegerValueType(1), s = IntegerValueType(1): IntegerValueType(1))

compiler/testData/resolveAnnotations/parameters/expressions/double.kt

@@ -8,4 +8,4 @@ annotation class Ann(
 
 Ann(1.0 + 1.0, 1.0 + 1, 1 + 1.0) class MyClass
 
-// EXPECTED: Ann[d1 = 2.0.toDouble(): jet.Double, d2 = 2.0.toDouble(): jet.Double, d3 = 2.0.toDouble(): jet.Double]
+// EXPECTED: Ann(d1 = 2.0.toDouble(): Double, d2 = 2.0.toDouble(): Double, d3 = 2.0.toDouble(): Double)

compiler/testData/resolveAnnotations/parameters/expressions/eqeq.kt

@@ -10,4 +10,4 @@ annotation class Ann(
 
 Ann(1 == 2, 1.0 == 2.0, 'b' == 'a', "a" == "b", "a" == "a") class MyClass
 
-// EXPECTED: Ann[b1 = false: jet.Boolean, b2 = false: jet.Boolean, b3 = false: jet.Boolean, b4 = false: jet.Boolean, b5 = true: jet.Boolean]
+// EXPECTED: Ann(b1 = false: Boolean, b2 = false: Boolean, b3 = false: Boolean, b4 = false: Boolean, b5 = true: Boolean)

compiler/testData/resolveAnnotations/parameters/expressions/escapedString.kt

@@ -4,4 +4,4 @@ annotation class Ann(val s1: String)
 
 Ann(s1 = "\$ab") class MyClass
 
-// EXPECTED: Ann[s1 = "$ab": jet.String]
+// EXPECTED: Ann(s1 = "$ab": String)

compiler/testData/resolveAnnotations/parameters/expressions/float.kt

@@ -9,4 +9,4 @@ annotation class Ann(
 
 Ann(1.toFloat() + 1.toFloat(), 1.toFloat() + 1, 1.toFloat() + 1.0) class MyClass
 
-// EXPECTED: Ann[d1 = 2.0.toFloat(): jet.Float, d2 = 2.0.toFloat(): jet.Float, d3 = 2.0.toDouble(): jet.Double]
+// EXPECTED: Ann(d1 = 2.0.toFloat(): Float, d2 = 2.0.toFloat(): Float, d3 = 2.0.toDouble(): Double)

compiler/testData/resolveAnnotations/parameters/expressions/gt.kt

@@ -14,4 +14,4 @@ val b = 2
 
 Ann(1 > 2, 1.0 > 2.0, 2 > a, b > a, 'b' > 'a', "a" > "b") class MyClass
 
-// EXPECTED: Ann[b1 = false: jet.Boolean, b2 = false: jet.Boolean, b3 = true: jet.Boolean, b4 = true: jet.Boolean, b5 = true: jet.Boolean, b6 = false: jet.Boolean]
+// EXPECTED: Ann(b1 = false: Boolean, b2 = false: Boolean, b3 = true: Boolean, b4 = true: Boolean, b5 = true: Boolean, b6 = false: Boolean)

compiler/testData/resolveAnnotations/parameters/expressions/gteq.kt

@@ -9,4 +9,4 @@ annotation class Ann(
 
 Ann(1 >= 2, 1.0 >= 2.0, 1 >= 1, 1.0 >= 1.0) class MyClass
 
-// EXPECTED: Ann[b1 = false: jet.Boolean, b2 = false: jet.Boolean, b3 = true: jet.Boolean, b4 = true: jet.Boolean]
+// EXPECTED: Ann(b1 = false: Boolean, b2 = false: Boolean, b3 = true: Boolean, b4 = true: Boolean)

compiler/testData/resolveAnnotations/parameters/expressions/infixCallBinary.kt

@@ -10,4 +10,4 @@ annotation class Ann(
 
 Ann(1 plus 1, 1 minus 1, 1 times 1, 1 div 1, 1 mod 1) class MyClass
 
-// EXPECTED: Ann[p1 = IntegerValueType(2): IntegerValueType(2), p2 = IntegerValueType(0): IntegerValueType(0), p3 = IntegerValueType(1): IntegerValueType(1), p4 = IntegerValueType(1): IntegerValueType(1), p5 = IntegerValueType(0): IntegerValueType(0)]
+// EXPECTED: Ann(p1 = IntegerValueType(2): IntegerValueType(2), p2 = IntegerValueType(0): IntegerValueType(0), p3 = IntegerValueType(1): IntegerValueType(1), p4 = IntegerValueType(1): IntegerValueType(1), p5 = IntegerValueType(0): IntegerValueType(0))

compiler/testData/resolveAnnotations/parameters/expressions/intrincics.kt

@@ -10,4 +10,4 @@ annotation class Ann(p1: Int,
 
 Ann(1 or 1, 1 and 1, 1 xor 1, 1 shl 1, 1 shr 1, 1 ushr 1) class MyClass
 
-// EXPECTED: Ann[p1 = IntegerValueType(1): IntegerValueType(1), p2 = IntegerValueType(1): IntegerValueType(1), p3 = IntegerValueType(0): IntegerValueType(0), p4 = IntegerValueType(2): IntegerValueType(2), p5 = IntegerValueType(0): IntegerValueType(0), p6 = IntegerValueType(0): IntegerValueType(0)]
+// EXPECTED: Ann(p1 = IntegerValueType(1): IntegerValueType(1), p2 = IntegerValueType(1): IntegerValueType(1), p3 = IntegerValueType(0): IntegerValueType(0), p4 = IntegerValueType(2): IntegerValueType(2), p5 = IntegerValueType(0): IntegerValueType(0), p6 = IntegerValueType(0): IntegerValueType(0))

compiler/testData/resolveAnnotations/parameters/expressions/labeled.kt

@@ -4,4 +4,4 @@ annotation class Ann(i: Double)
 
 Ann(@A 1.0) class MyClass
 
-// EXPECTED: Ann[i = 1.0.toDouble(): jet.Double]
+// EXPECTED: Ann(i = 1.0.toDouble(): Double)

compiler/testData/resolveAnnotations/parameters/expressions/long.kt

@@ -8,4 +8,4 @@ annotation class Ann(
 
 Ann(1 + 1, java.lang.Long.MAX_VALUE + 1 - 1, java.lang.Long.MAX_VALUE - 1) class MyClass
 
-// EXPECTED: Ann[l1 = IntegerValueType(2): IntegerValueType(2), l2 = 9223372036854775807.toLong(): jet.Long, l3 = 9223372036854775806.toLong(): jet.Long]
+// EXPECTED: Ann(l1 = IntegerValueType(2): IntegerValueType(2), l2 = 9223372036854775807.toLong(): Long, l3 = 9223372036854775806.toLong(): Long)

compiler/testData/resolveAnnotations/parameters/expressions/lt.kt

@@ -14,4 +14,4 @@ val b = 2
 
 Ann(1 < 2, 1.0 < 2.0, 2 < a, b < a, 'b' < 'a', "a" < "b") class MyClass
 
-// EXPECTED: Ann[b1 = true: jet.Boolean, b2 = true: jet.Boolean, b3 = false: jet.Boolean, b4 = false: jet.Boolean, b5 = false: jet.Boolean, b6 = true: jet.Boolean]
+// EXPECTED: Ann(b1 = true: Boolean, b2 = true: Boolean, b3 = false: Boolean, b4 = false: Boolean, b5 = false: Boolean, b6 = true: Boolean)

compiler/testData/resolveAnnotations/parameters/expressions/lteq.kt

@@ -9,4 +9,4 @@ annotation class Ann(
 
 Ann(1 <= 2, 1.0 <= 2.0, 1 <= 1, 1.0 <= 1.0) class MyClass
 
-// EXPECTED: Ann[b1 = true: jet.Boolean, b2 = true: jet.Boolean, b3 = true: jet.Boolean, b4 = true: jet.Boolean]
+// EXPECTED: Ann(b1 = true: Boolean, b2 = true: Boolean, b3 = true: Boolean, b4 = true: Boolean)

compiler/testData/resolveAnnotations/parameters/expressions/maxValue.kt

@@ -18,4 +18,4 @@ Ann(
     p6 = java.lang.Long.MAX_VALUE + 1
 ) class MyClass
 
-// EXPECTED: Ann[p1 = 128.toInt(): jet.Int, p2 = 32768.toInt(): jet.Int, p3 = -2147483648.toInt(): jet.Int, p4 = -2147483648.toInt(): jet.Int, p5 = 2147483648.toLong(): jet.Long, p6 = -9223372036854775808.toLong(): jet.Long]
+// EXPECTED: Ann(p1 = 128.toInt(): Int, p2 = 32768.toInt(): Int, p3 = -2147483648.toInt(): Int, p4 = -2147483648.toInt(): Int, p5 = 2147483648.toLong(): Long, p6 = -9223372036854775808.toLong(): Long)

compiler/testData/resolveAnnotations/parameters/expressions/maxValueByte.kt

@@ -16,4 +16,4 @@ Ann(
     p5 = 1.toByte() + 1.toByte()
 ) class MyClass
 
-// EXPECTED: Ann[p1 = 128.toInt(): jet.Int, p2 = IntegerValueType(2): IntegerValueType(2), p3 = 128.toInt(): jet.Int, p4 = 2.toInt(): jet.Int, p5 = 2.toInt(): jet.Int]
+// EXPECTED: Ann(p1 = 128.toInt(): Int, p2 = IntegerValueType(2): IntegerValueType(2), p3 = 128.toInt(): Int, p4 = 2.toInt(): Int, p5 = 2.toInt(): Int)

compiler/testData/resolveAnnotations/parameters/expressions/maxValueInt.kt

@@ -16,4 +16,4 @@ Ann(
     p5 = 1.toInt() + 1.toInt()
 ) class MyClass
 
-// EXPECTED: Ann[p1 = -2147483648.toInt(): jet.Int, p2 = IntegerValueType(2): IntegerValueType(2), p3 = -2147483648.toInt(): jet.Int, p4 = 2.toInt(): jet.Int, p5 = 2.toInt(): jet.Int]
+// EXPECTED: Ann(p1 = -2147483648.toInt(): Int, p2 = IntegerValueType(2): IntegerValueType(2), p3 = -2147483648.toInt(): Int, p4 = 2.toInt(): Int, p5 = 2.toInt(): Int)

compiler/testData/resolveAnnotations/parameters/expressions/miltiply.kt

@@ -9,4 +9,4 @@ annotation class Ann(
 
 Ann(1 * 1, 1 * 1, 1 * 1, 1 * 1) class MyClass
 
-// EXPECTED: Ann[b = IntegerValueType(1): IntegerValueType(1), i = IntegerValueType(1): IntegerValueType(1), l = IntegerValueType(1): IntegerValueType(1), s = IntegerValueType(1): IntegerValueType(1)]
+// EXPECTED: Ann(b = IntegerValueType(1): IntegerValueType(1), i = IntegerValueType(1): IntegerValueType(1), l = IntegerValueType(1): IntegerValueType(1), s = IntegerValueType(1): IntegerValueType(1))

compiler/testData/resolveAnnotations/parameters/expressions/minus.kt

@@ -9,4 +9,4 @@ annotation class Ann(
 
 Ann(1 - 1, 1 - 1, 1 - 1, 1 - 1) class MyClass
 
-// EXPECTED: Ann[b = IntegerValueType(0): IntegerValueType(0), i = IntegerValueType(0): IntegerValueType(0), l = IntegerValueType(0): IntegerValueType(0), s = IntegerValueType(0): IntegerValueType(0)]
+// EXPECTED: Ann(b = IntegerValueType(0): IntegerValueType(0), i = IntegerValueType(0): IntegerValueType(0), l = IntegerValueType(0): IntegerValueType(0), s = IntegerValueType(0): IntegerValueType(0))

compiler/testData/resolveAnnotations/parameters/expressions/mod.kt

@@ -9,4 +9,4 @@ annotation class Ann(
 
 Ann(1 % 1, 1 % 1, 1 % 1, 1 % 1) class MyClass
 
-// EXPECTED: Ann[b = IntegerValueType(0): IntegerValueType(0), i = IntegerValueType(0): IntegerValueType(0), l = IntegerValueType(0): IntegerValueType(0), s = IntegerValueType(0): IntegerValueType(0)]
+// EXPECTED: Ann(b = IntegerValueType(0): IntegerValueType(0), i = IntegerValueType(0): IntegerValueType(0), l = IntegerValueType(0): IntegerValueType(0), s = IntegerValueType(0): IntegerValueType(0))

compiler/testData/resolveAnnotations/parameters/expressions/multilineString.kt

@@ -4,4 +4,4 @@ annotation class Ann(val s1: String)
 
 Ann(s1 = """a""" + "b") class MyClass
 
-// EXPECTED: Ann[s1 = "ab": jet.String]
+// EXPECTED: Ann(s1 = "ab": String)

compiler/testData/resolveAnnotations/parameters/expressions/not.kt

@@ -8,4 +8,4 @@ annotation class Ann(
 
 Ann(!true, !false) class MyClass
 
-// EXPECTED: Ann[b1 = false: jet.Boolean, b2 = true: jet.Boolean]
+// EXPECTED: Ann(b1 = false: Boolean, b2 = true: Boolean)

compiler/testData/resolveAnnotations/parameters/expressions/noteq.kt

@@ -10,4 +10,4 @@ annotation class Ann(
 
 Ann(1 != 2, 1.0 != 2.0, 'b' != 'a', "a" != "b", "a" != "a") class MyClass
 
-// EXPECTED: Ann[b1 = true: jet.Boolean, b2 = true: jet.Boolean, b3 = true: jet.Boolean, b4 = true: jet.Boolean, b5 = false: jet.Boolean]
+// EXPECTED: Ann(b1 = true: Boolean, b2 = true: Boolean, b3 = true: Boolean, b4 = true: Boolean, b5 = false: Boolean)

compiler/testData/resolveAnnotations/parameters/expressions/orOr.kt

@@ -7,4 +7,4 @@ annotation class Ann(
 
 Ann(true || false, true || true) class MyClass
 
-// EXPECTED: Ann[b1 = true: jet.Boolean, b2 = true: jet.Boolean]
+// EXPECTED: Ann(b1 = true: Boolean, b2 = true: Boolean)

compiler/testData/resolveAnnotations/parameters/expressions/paranthesized.kt

@@ -4,4 +4,4 @@ annotation class Ann(i: Int)
 
 Ann((1 + 2) * 2) class MyClass
 
-// EXPECTED: Ann[i = IntegerValueType(6): IntegerValueType(6)]
+// EXPECTED: Ann(i = IntegerValueType(6): IntegerValueType(6))

compiler/testData/resolveAnnotations/parameters/expressions/plus.kt

@@ -9,4 +9,4 @@ annotation class Ann(
 
 Ann(1 + 1, 1 + 1, 1 + 1, 1 + 1) class MyClass
 
-// EXPECTED: Ann[b = IntegerValueType(2): IntegerValueType(2), i = IntegerValueType(2): IntegerValueType(2), l = IntegerValueType(2): IntegerValueType(2), s = IntegerValueType(2): IntegerValueType(2)]
+// EXPECTED: Ann(b = IntegerValueType(2): IntegerValueType(2), i = IntegerValueType(2): IntegerValueType(2), l = IntegerValueType(2): IntegerValueType(2), s = IntegerValueType(2): IntegerValueType(2))

compiler/testData/resolveAnnotations/parameters/expressions/simpleCallBinary.kt

@@ -10,4 +10,4 @@ annotation class Ann(
 
 Ann(1.plus(1), 1.minus(1), 1.times(1), 1.div(1), 1.mod(1)) class MyClass
 
-// EXPECTED: Ann[p1 = IntegerValueType(2): IntegerValueType(2), p2 = IntegerValueType(0): IntegerValueType(0), p3 = IntegerValueType(1): IntegerValueType(1), p4 = IntegerValueType(1): IntegerValueType(1), p5 = IntegerValueType(0): IntegerValueType(0)]
+// EXPECTED: Ann(p1 = IntegerValueType(2): IntegerValueType(2), p2 = IntegerValueType(0): IntegerValueType(0), p3 = IntegerValueType(1): IntegerValueType(1), p4 = IntegerValueType(1): IntegerValueType(1), p5 = IntegerValueType(0): IntegerValueType(0))

compiler/testData/resolveAnnotations/parameters/expressions/stringPlusInt.kt

@@ -4,4 +4,4 @@ annotation class Ann(val s1: String)
 
 Ann(s1 = "a" + 1) class MyClass
 
-// EXPECTED: Ann[s1 = "a1": jet.String]
+// EXPECTED: Ann(s1 = "a1": String)

compiler/testData/resolveAnnotations/parameters/expressions/stringTemplate.kt

@@ -16,4 +16,4 @@ Ann(
     s4 = "a${i}a$i"
 ) class MyClass
 
-// EXPECTED: Ann[s1 = "a1": jet.String, s2 = "a1 b": jet.String, s3 = "1": jet.String, s4 = "a1a1": jet.String]
+// EXPECTED: Ann(s1 = "a1": String, s2 = "a1 b": String, s3 = "1": String, s4 = "a1a1": String)

compiler/testData/resolveAnnotations/parameters/expressions/strings.kt

@@ -6,4 +6,4 @@ val i = 1
 
 Ann(s1 = "a" + "b", s2 = "a" + "a$i") class MyClass
 
-// EXPECTED: Ann[s1 = "ab": jet.String, s2 = "aa1": jet.String]
+// EXPECTED: Ann(s1 = "ab": String, s2 = "aa1": String)

compiler/testData/resolveAnnotations/parameters/expressions/unaryMinus.kt

@@ -12,4 +12,4 @@ annotation class Ann(
 
 Ann(-1, -1, -1, -1, -1.0, -1.0.toFloat(), -'c') class MyClass
 
-// EXPECTED: Ann[b1 = IntegerValueType(-1): IntegerValueType(-1), b2 = IntegerValueType(-1): IntegerValueType(-1), b3 = IntegerValueType(-1): IntegerValueType(-1), b4 = IntegerValueType(-1): IntegerValueType(-1), b5 = -1.0.toDouble(): jet.Double, b6 = -1.0.toFloat(): jet.Float, b7 = IntegerValueType(-99): IntegerValueType(-99)]
+// EXPECTED: Ann(b1 = IntegerValueType(-1): IntegerValueType(-1), b2 = IntegerValueType(-1): IntegerValueType(-1), b3 = IntegerValueType(-1): IntegerValueType(-1), b4 = IntegerValueType(-1): IntegerValueType(-1), b5 = -1.0.toDouble(): Double, b6 = -1.0.toFloat(): Float, b7 = IntegerValueType(-99): IntegerValueType(-99))

compiler/testData/resolveAnnotations/parameters/expressions/unaryPlus.kt

@@ -12,4 +12,4 @@ annotation class Ann(
 
 Ann(+1, +1, +1, +1, +1.0, +1.0.toFloat(), +'c') class MyClass
 
-// EXPECTED: Ann[b1 = IntegerValueType(1): IntegerValueType(1), b2 = IntegerValueType(1): IntegerValueType(1), b3 = IntegerValueType(1): IntegerValueType(1), b4 = IntegerValueType(1): IntegerValueType(1), b5 = 1.0.toDouble(): jet.Double, b6 = 1.0.toFloat(): jet.Float, b7 = IntegerValueType(99): IntegerValueType(99)]
+// EXPECTED: Ann(b1 = IntegerValueType(1): IntegerValueType(1), b2 = IntegerValueType(1): IntegerValueType(1), b3 = IntegerValueType(1): IntegerValueType(1), b4 = IntegerValueType(1): IntegerValueType(1), b5 = 1.0.toDouble(): Double, b6 = 1.0.toFloat(): Float, b7 = IntegerValueType(99): IntegerValueType(99))

compiler/testData/resolveAnnotations/parameters/float.kt

@@ -7,4 +7,4 @@ annotation class Ann(
 
 Ann(1.toFloat(), 1.0.toFloat()) class MyClass
 
-// EXPECTED: Ann[b1 = 1.0.toFloat(): jet.Float, b2 = 1.0.toFloat(): jet.Float]
+// EXPECTED: Ann(b1 = 1.0.toFloat(): Float, b2 = 1.0.toFloat(): Float)

compiler/testData/resolveAnnotations/parameters/int.kt

@@ -9,4 +9,4 @@ annotation class Ann(
 
 Ann(1, 1.toInt(), 2147483648.toInt(), 2147483648) class MyClass
 
-// EXPECTED: Ann[b1 = IntegerValueType(1): IntegerValueType(1), b2 = 1.toInt(): jet.Int, b3 = -2147483648.toInt(): jet.Int, b4 = IntegerValueType(2147483648): IntegerValueType(2147483648)]
+// EXPECTED: Ann(b1 = IntegerValueType(1): IntegerValueType(1), b2 = 1.toInt(): Int, b3 = -2147483648.toInt(): Int, b4 = IntegerValueType(2147483648): IntegerValueType(2147483648))

compiler/testData/resolveAnnotations/parameters/long.kt

@@ -7,4 +7,4 @@ annotation class Ann(
 
 Ann(1, 1.toLong()) class MyClass
 
-// EXPECTED: Ann[b1 = IntegerValueType(1): IntegerValueType(1), b2 = 1.toLong(): jet.Long]
+// EXPECTED: Ann(b1 = IntegerValueType(1): IntegerValueType(1), b2 = 1.toLong(): Long)

compiler/testData/resolveAnnotations/parameters/short.kt

@@ -9,4 +9,4 @@ annotation class Ann(
 
 Ann(1, 1.toShort(), 32768.toShort(), 32768) class MyClass
 
-// EXPECTED: Ann[b1 = IntegerValueType(1): IntegerValueType(1), b2 = 1.toShort(): jet.Short, b3 = -32768.toShort(): jet.Short, b4 = IntegerValueType(32768): IntegerValueType(32768)]
+// EXPECTED: Ann(b1 = IntegerValueType(1): IntegerValueType(1), b2 = 1.toShort(): Short, b3 = -32768.toShort(): Short, b4 = IntegerValueType(32768): IntegerValueType(32768))