Fix language features in tests for gradual migration to 1.3 version

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_after.kt

@@ -0,0 +1,15 @@
+// !LANGUAGE: +ProhibitNonConstValuesAsVarargsInAnnotations
+
+annotation class AnnE(val i: MyEnum)
+
+@AnnE(<!ANNOTATION_ARGUMENT_MUST_BE_ENUM_CONST!>e<!>)
+class Test
+
+val e: MyEnum = MyEnum.A
+
+enum class MyEnum {
+    A
+}
+
+@AnnE(<!TYPE_MISMATCH, ANNOTATION_ARGUMENT_MUST_BE_CONST!>Test()<!>)
+class Test2

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_before.kt

@@ -1,3 +1,5 @@
+// !LANGUAGE: -ProhibitNonConstValuesAsVarargsInAnnotations
+
 annotation class AnnE(val i: MyEnum)
 
 @AnnE(<!ANNOTATION_ARGUMENT_MUST_BE_ENUM_CONST!>e<!>)

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_before.txt

@@ -0,0 +1,44 @@
+package
+
+public val e: MyEnum
+
+public final annotation class AnnE : kotlin.Annotation {
+    public constructor AnnE(/*0*/ i: MyEnum)
+    public final val i: MyEnum
+    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
+}
+
+public final enum class MyEnum : kotlin.Enum<MyEnum> {
+    enum entry A
+
+    private constructor MyEnum()
+    public final override /*1*/ /*fake_override*/ val name: kotlin.String
+    public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit
+    public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<MyEnum!>!
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
+    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
+}
+
+@AnnE public 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
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+@AnnE public final class Test2 {
+    public constructor Test2()
+    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/kt1886annotationBody_after.kt

@@ -0,0 +1,31 @@
+// !LANGUAGE: +NestedClassesInAnnotations
+
+annotation class Annotation2() {
+    <!ANNOTATION_CLASS_MEMBER!>public val s: String = ""<!>
+}
+
+annotation class Annotation3() {
+    <!ANNOTATION_CLASS_MEMBER!>public fun foo() {}<!>
+}
+
+annotation class Annotation4() {
+    class Foo() {}
+}
+
+annotation class Annotation5() {
+    companion object {}
+}
+
+annotation class Annotation6() {
+    <!ANNOTATION_CLASS_MEMBER!>init {}<!>
+}
+
+annotation class Annotation1() {}
+
+annotation class Annotation7(val name: String) {}
+
+annotation class Annotation8(<!VAR_ANNOTATION_PARAMETER!>var<!> name: String = "") {}
+
+annotation class Annotation9(val name: String)
+
+annotation class Annotation10

compiler/testData/diagnostics/tests/annotations/kt1886annotationBody_before.kt

@@ -1,3 +1,5 @@
+// !LANGUAGE: -NestedClassesInAnnotations
+
 annotation class Annotation2() {
     <!ANNOTATION_CLASS_MEMBER!>public val s: String = ""<!>
 }

compiler/testData/diagnostics/tests/annotations/kt1886annotationBody_before.txt

@@ -0,0 +1,90 @@
+package
+
+public final annotation class Annotation1 : kotlin.Annotation {
+    public constructor Annotation1()
+    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
+}
+
+public final annotation class Annotation10 : kotlin.Annotation {
+    public constructor Annotation10()
+    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
+}
+
+public final annotation class Annotation2 : kotlin.Annotation {
+    public constructor Annotation2()
+    public final val s: kotlin.String = ""
+    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
+}
+
+public final annotation class Annotation3 : kotlin.Annotation {
+    public constructor Annotation3()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public 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
+}
+
+public final annotation class Annotation4 : kotlin.Annotation {
+    public constructor Annotation4()
+    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
+
+    public final class Foo {
+        public constructor Foo()
+        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
+    }
+}
+
+public final annotation class Annotation5 : kotlin.Annotation {
+    public constructor Annotation5()
+    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
+
+    public companion object Companion {
+        private constructor Companion()
+        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
+    }
+}
+
+public final annotation class Annotation6 : kotlin.Annotation {
+    public constructor Annotation6()
+    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
+}
+
+public final annotation class Annotation7 : kotlin.Annotation {
+    public constructor Annotation7(/*0*/ name: kotlin.String)
+    public final val name: kotlin.String
+    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
+}
+
+public final annotation class Annotation8 : kotlin.Annotation {
+    public constructor Annotation8(/*0*/ name: kotlin.String = ...)
+    public final var name: kotlin.String
+    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
+}
+
+public final annotation class Annotation9 : kotlin.Annotation {
+    public constructor Annotation9(/*0*/ name: kotlin.String)
+    public final val name: kotlin.String
+    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/withUseSiteTarget/fileAnnotationWithoutColon_after.kt

@@ -0,0 +1,11 @@
+// !LANGUAGE: +RestrictionOfWrongAnnotationsWithUseSiteTargetsOnTypes
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+
+fun test1(<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@<!INAPPLICABLE_FILE_TARGET!>file<!><!SYNTAX!><!> Suppress("")<!> x: Int) {}
+
+<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@<!INAPPLICABLE_FILE_TARGET!>file<!> <!SYNTAX!>@<!>Suppress("")<!>
+fun test2() {}
+
+class OnType(x: <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file<!SYNTAX!><!> Suppress("")<!> Int)
+
+fun <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file : Suppress("")<!> Int.test3() {}

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/fileAnnotationWithoutColon_before.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -RestrictionOfWrongAnnotationsWithUseSiteTargetsOnTypes
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun test1(<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@<!INAPPLICABLE_FILE_TARGET!>file<!><!SYNTAX!><!> Suppress("")<!> x: Int) {}

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/fileAnnotationWithoutColon_before.txt

@@ -0,0 +1,12 @@
+package
+
+public fun test1(/*0*/ @file:kotlin.Suppress(names = {""}) x: kotlin.Int): kotlin.Unit
+@file:kotlin.Suppress(names = {""}) public fun test2(): kotlin.Unit
+public fun @file:kotlin.Suppress(names = {""}) kotlin.Int.test3(): kotlin.Unit
+
+public final class OnType {
+    public constructor OnType(/*0*/ x: @file:kotlin.Suppress(names = {""}) 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/withUseSiteTarget/receiverUseSiteTargetOnExtensionFunction_after.kt

@@ -0,0 +1,10 @@
+// !LANGUAGE: +RestrictionOfWrongAnnotationsWithUseSiteTargetsOnTypes
+
+@Target(AnnotationTarget.VALUE_PARAMETER)
+annotation class Fancy
+
+fun @receiver:Fancy String.myExtension() { }
+val @receiver:Fancy Int.asVal get() = 0
+
+fun ((<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@receiver:Fancy<!> Int) -> Unit).complexReceiver1() {}
+fun ((Int) -> <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@receiver:Fancy<!> Unit).complexReceiver2() {}

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/receiverUseSiteTargetOnExtensionFunction_before.kt

@@ -1,3 +1,5 @@
+// !LANGUAGE: -RestrictionOfWrongAnnotationsWithUseSiteTargetsOnTypes
+
 @Target(AnnotationTarget.VALUE_PARAMETER)
 annotation class Fancy
 

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/receiverUseSiteTargetOnExtensionFunction_before.txt

@@ -0,0 +1,13 @@
+package
+
+public val @receiver:Fancy kotlin.Int.asVal: kotlin.Int
+public fun ((@receiver:Fancy kotlin.Int) -> kotlin.Unit).complexReceiver1(): kotlin.Unit
+public fun ((kotlin.Int) -> @receiver:Fancy kotlin.Unit).complexReceiver2(): kotlin.Unit
+public fun @receiver:Fancy kotlin.String.myExtension(): kotlin.Unit
+
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) public final annotation class Fancy : kotlin.Annotation {
+    public constructor Fancy()
+    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/withUseSiteTarget/wrongParamAnnotationsOnTypes_after.kt

@@ -0,0 +1,13 @@
+// !LANGUAGE: +RestrictionOfWrongAnnotationsWithUseSiteTargetsOnTypes
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+
+fun test1(i: <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@setparam:Suppress<!> Int) {}
+fun test2(i: <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@param:Suppress<!> Int) {}
+fun test3(i: <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@receiver:Suppress<!> Int) {}
+
+fun test4(): <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@setparam:Suppress<!> Int = TODO()
+fun test5(i: (<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@setparam:Suppress<!> Int) -> Unit) {}
+
+fun ((<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@setparam:Suppress<!> Int) -> Unit).test6() {}
+
+fun test7(): ((<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@setparam:Suppress<!> Int) -> Unit) = TODO()

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/wrongParamAnnotationsOnTypes_before.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -RestrictionOfWrongAnnotationsWithUseSiteTargetsOnTypes
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun test1(i: <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET_ON_TYPE!>@setparam:Suppress<!> Int) {}

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/wrongParamAnnotationsOnTypes_before.txt

@@ -0,0 +1,9 @@
+package
+
+public fun test1(/*0*/ i: @setparam:kotlin.Suppress(names = {}) kotlin.Int): kotlin.Unit
+public fun test2(/*0*/ i: @param:kotlin.Suppress(names = {}) kotlin.Int): kotlin.Unit
+public fun test3(/*0*/ i: @receiver:kotlin.Suppress(names = {}) kotlin.Int): kotlin.Unit
+public fun test4(): @setparam:kotlin.Suppress(names = {}) kotlin.Int
+public fun test5(/*0*/ i: (@setparam:kotlin.Suppress(names = {}) kotlin.Int) -> kotlin.Unit): kotlin.Unit
+public fun test7(): (@setparam:kotlin.Suppress(names = {}) kotlin.Int) -> kotlin.Unit
+public fun ((@setparam:kotlin.Suppress(names = {}) kotlin.Int) -> kotlin.Unit).test6(): kotlin.Unit

compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java

@@ -953,9 +953,14 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                 runTest("compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt");
             }
 
-            @TestMetadata("kt1886annotationBody.kt")
-            public void testKt1886annotationBody() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.kt");
+            @TestMetadata("kt1886annotationBody_after.kt")
+            public void testKt1886annotationBody_after() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/annotations/kt1886annotationBody_after.kt");
+            }
+
+            @TestMetadata("kt1886annotationBody_before.kt")
+            public void testKt1886annotationBody_before() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/annotations/kt1886annotationBody_before.kt");
             }
 
             @TestMetadata("missingValOnParameter.kt")
@@ -1115,9 +1120,14 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                     runTest("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.kt");
                 }
 
-                @TestMetadata("enumConst.kt")
-                public void testEnumConst() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.kt");
+                @TestMetadata("enumConst_after.kt")
+                public void testEnumConst_after() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_after.kt");
+                }
+
+                @TestMetadata("enumConst_before.kt")
+                public void testEnumConst_before() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_before.kt");
                 }
 
                 @TestMetadata("javaProperties.kt")
@@ -1404,9 +1414,14 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                     runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.kt");
                 }
 
-                @TestMetadata("fileAnnotationWithoutColon.kt")
-                public void testFileAnnotationWithoutColon() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/fileAnnotationWithoutColon.kt");
+                @TestMetadata("fileAnnotationWithoutColon_after.kt")
+                public void testFileAnnotationWithoutColon_after() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/fileAnnotationWithoutColon_after.kt");
+                }
+
+                @TestMetadata("fileAnnotationWithoutColon_before.kt")
+                public void testFileAnnotationWithoutColon_before() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/fileAnnotationWithoutColon_before.kt");
                 }
 
                 @TestMetadata("FileAnnotations.kt")
@@ -1434,9 +1449,14 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                     runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ReceiverAnnotations.kt");
                 }
 
-                @TestMetadata("receiverUseSiteTargetOnExtensionFunction.kt")
-                public void testReceiverUseSiteTargetOnExtensionFunction() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/receiverUseSiteTargetOnExtensionFunction.kt");
+                @TestMetadata("receiverUseSiteTargetOnExtensionFunction_after.kt")
+                public void testReceiverUseSiteTargetOnExtensionFunction_after() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/receiverUseSiteTargetOnExtensionFunction_after.kt");
+                }
+
+                @TestMetadata("receiverUseSiteTargetOnExtensionFunction_before.kt")
+                public void testReceiverUseSiteTargetOnExtensionFunction_before() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/receiverUseSiteTargetOnExtensionFunction_before.kt");
                 }
 
                 @TestMetadata("repeatable.kt")
@@ -1454,15 +1474,20 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                     runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.kt");
                 }
 
-                @TestMetadata("wrongParamAnnotationsOnTypes.kt")
-                public void testWrongParamAnnotationsOnTypes() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/wrongParamAnnotationsOnTypes.kt");
-                }
-
                 @TestMetadata("wrongParamAnnotationsOnTypesError.kt")
                 public void testWrongParamAnnotationsOnTypesError() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/wrongParamAnnotationsOnTypesError.kt");
                 }
+
+                @TestMetadata("wrongParamAnnotationsOnTypes_after.kt")
+                public void testWrongParamAnnotationsOnTypes_after() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/wrongParamAnnotationsOnTypes_after.kt");
+                }
+
+                @TestMetadata("wrongParamAnnotationsOnTypes_before.kt")
+                public void testWrongParamAnnotationsOnTypes_before() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/wrongParamAnnotationsOnTypes_before.kt");
+                }
             }
         }
 

compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java

@@ -953,9 +953,14 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                 runTest("compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt");
             }
 
-            @TestMetadata("kt1886annotationBody.kt")
-            public void testKt1886annotationBody() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.kt");
+            @TestMetadata("kt1886annotationBody_after.kt")
+            public void testKt1886annotationBody_after() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/annotations/kt1886annotationBody_after.kt");
+            }
+
+            @TestMetadata("kt1886annotationBody_before.kt")
+            public void testKt1886annotationBody_before() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/annotations/kt1886annotationBody_before.kt");
             }
 
             @TestMetadata("missingValOnParameter.kt")
@@ -1115,9 +1120,14 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                     runTest("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.kt");
                 }
 
-                @TestMetadata("enumConst.kt")
-                public void testEnumConst() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.kt");
+                @TestMetadata("enumConst_after.kt")
+                public void testEnumConst_after() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_after.kt");
+                }
+
+                @TestMetadata("enumConst_before.kt")
+                public void testEnumConst_before() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_before.kt");
                 }
 
                 @TestMetadata("javaProperties.kt")
@@ -1404,9 +1414,14 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                     runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.kt");
                 }
 
-                @TestMetadata("fileAnnotationWithoutColon.kt")
-                public void testFileAnnotationWithoutColon() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/fileAnnotationWithoutColon.kt");
+                @TestMetadata("fileAnnotationWithoutColon_after.kt")
+                public void testFileAnnotationWithoutColon_after() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/fileAnnotationWithoutColon_after.kt");
+                }
+
+                @TestMetadata("fileAnnotationWithoutColon_before.kt")
+                public void testFileAnnotationWithoutColon_before() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/fileAnnotationWithoutColon_before.kt");
                 }
 
                 @TestMetadata("FileAnnotations.kt")
@@ -1434,9 +1449,14 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                     runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ReceiverAnnotations.kt");
                 }
 
-                @TestMetadata("receiverUseSiteTargetOnExtensionFunction.kt")
-                public void testReceiverUseSiteTargetOnExtensionFunction() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/receiverUseSiteTargetOnExtensionFunction.kt");
+                @TestMetadata("receiverUseSiteTargetOnExtensionFunction_after.kt")
+                public void testReceiverUseSiteTargetOnExtensionFunction_after() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/receiverUseSiteTargetOnExtensionFunction_after.kt");
+                }
+
+                @TestMetadata("receiverUseSiteTargetOnExtensionFunction_before.kt")
+                public void testReceiverUseSiteTargetOnExtensionFunction_before() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/receiverUseSiteTargetOnExtensionFunction_before.kt");
                 }
 
                 @TestMetadata("repeatable.kt")
@@ -1454,15 +1474,20 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                     runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.kt");
                 }
 
-                @TestMetadata("wrongParamAnnotationsOnTypes.kt")
-                public void testWrongParamAnnotationsOnTypes() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/wrongParamAnnotationsOnTypes.kt");
-                }
-
                 @TestMetadata("wrongParamAnnotationsOnTypesError.kt")
                 public void testWrongParamAnnotationsOnTypesError() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/wrongParamAnnotationsOnTypesError.kt");
                 }
+
+                @TestMetadata("wrongParamAnnotationsOnTypes_after.kt")
+                public void testWrongParamAnnotationsOnTypes_after() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/wrongParamAnnotationsOnTypes_after.kt");
+                }
+
+                @TestMetadata("wrongParamAnnotationsOnTypes_before.kt")
+                public void testWrongParamAnnotationsOnTypes_before() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/wrongParamAnnotationsOnTypes_before.kt");
+                }
             }
         }