[TD] Update diagnostics test data due to new test runners

Update includes:
- Changing syntax of `OI/`NI` tags from `<!NI;TAG!>` to `<!TAG{NI}!>`
- Fix some incorrect directives
- Change order of diagnostics in some places
- Remove ignored diagnostics from FIR test data (previously `DIAGNOSTICS` didn't work)
- Update FIR dumps in some places and add `FIR_IDENTICAL` if needed
- Replace all JAVAC_SKIP with SKIP_JAVAC directive

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationArgumentEquality.txt

@@ -79,7 +79,6 @@ public final expect annotation class Primitives : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -162,3 +161,4 @@ public final actual annotation class Primitives : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.txt

@@ -48,7 +48,6 @@ public final expect annotation class A5 : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -98,3 +97,4 @@ public final actual annotation class A5 : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.txt

@@ -48,7 +48,6 @@ public final expect annotation class A5 : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -103,3 +102,4 @@ public actual typealias A2 = J2
 public actual typealias A3 = J3
 public actual typealias A4 = J4
 public actual typealias A5 = J5
+

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias2.txt

@@ -63,7 +63,6 @@ public final enum class E : kotlin.Enum<E> {
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -131,3 +130,4 @@ public final annotation class Jnno : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 public actual typealias Anno = Jnno
+

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.txt

@@ -24,7 +24,6 @@ public final expect class Ok {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -50,3 +49,4 @@ public final actual class Ok {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.txt

@@ -15,7 +15,6 @@ public open expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -33,3 +32,4 @@ public open actual class Foo {
     public final actual fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.txt

@@ -21,7 +21,6 @@ public interface Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -45,3 +44,4 @@ public interface Foo {
     public abstract fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedVsNonExpectedWithDefaults.txt

@@ -3,10 +3,10 @@ package
 
 public expect fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
 
-
 // -- Module: <m2-jvm> --
 package
 
 public fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Long = ...): kotlin.Unit
 public actual fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String): kotlin.Unit
 public fun test(): kotlin.Unit
+

compiler/testData/diagnostics/tests/multiplatform/deprecated/header.fir.kt

@@ -27,4 +27,4 @@ impl object O
 
 impl enum class E {
     FIRST
-}
+}

compiler/testData/diagnostics/tests/multiplatform/deprecated/header.kt

@@ -2,15 +2,15 @@
 // MODULE: m1-common
 // FILE: common.kt
 
-<!DEPRECATED_MODIFIER, JVM:DEPRECATED_MODIFIER!>header<!> class My
+<!DEPRECATED_MODIFIER, DEPRECATED_MODIFIER{JVM}!>header<!> class My
 
-<!DEPRECATED_MODIFIER, JVM:DEPRECATED_MODIFIER!>header<!> fun foo(): Int
+<!DEPRECATED_MODIFIER, DEPRECATED_MODIFIER{JVM}!>header<!> fun foo(): Int
 
-<!DEPRECATED_MODIFIER, JVM:DEPRECATED_MODIFIER!>header<!> val x: String
+<!DEPRECATED_MODIFIER, DEPRECATED_MODIFIER{JVM}!>header<!> val x: String
 
-<!DEPRECATED_MODIFIER, JVM:DEPRECATED_MODIFIER!>header<!> object O
+<!DEPRECATED_MODIFIER, DEPRECATED_MODIFIER{JVM}!>header<!> object O
 
-<!DEPRECATED_MODIFIER, JVM:DEPRECATED_MODIFIER!>header<!> enum class E {
+<!DEPRECATED_MODIFIER, DEPRECATED_MODIFIER{JVM}!>header<!> enum class E {
     FIRST
 }
 
@@ -27,4 +27,4 @@
 
 <!DEPRECATED_MODIFIER!>impl<!> enum class E {
     FIRST
-}
+}

compiler/testData/diagnostics/tests/multiplatform/deprecated/header.txt

@@ -32,7 +32,6 @@ public expect object O {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -71,3 +70,4 @@ public actual object O {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/enum/additionalEntriesInImpl.txt

@@ -39,7 +39,6 @@ public final expect enum class Foo : kotlin.Enum<Foo> {
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -96,3 +95,4 @@ public final actual enum class Foo : kotlin.Enum<Foo> {
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
+

compiler/testData/diagnostics/tests/multiplatform/enum/differentEntryOrder.txt

@@ -39,7 +39,6 @@ public final expect enum class Foo : kotlin.Enum<Foo> {
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -86,3 +85,4 @@ public final actual enum class Foo : kotlin.Enum<Foo> {
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
+

compiler/testData/diagnostics/tests/multiplatform/enum/javaEnum.txt

@@ -31,7 +31,6 @@ public final expect enum class _TimeUnit : kotlin.Enum<_TimeUnit> {
     public final /*synthesized*/ fun values(): kotlin.Array<_TimeUnit>
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -57,3 +56,4 @@ public final enum class FooImpl : kotlin.Enum<FooImpl!> {
 }
 public actual typealias Foo = FooImpl
 public actual typealias _TimeUnit = java.util.concurrent.TimeUnit
+

compiler/testData/diagnostics/tests/multiplatform/enum/simpleEnum.txt

@@ -21,7 +21,6 @@ public final expect enum class Foo : kotlin.Enum<Foo> {
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -48,3 +47,4 @@ public final actual enum class Foo : kotlin.Enum<Foo> {
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
+

compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.txt

@@ -13,7 +13,6 @@ public expect interface My {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m1-jvm> --
 package
 
@@ -28,3 +27,4 @@ public actual interface My {
     public open actual fun openFunPositive(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/generic/functionTypeParameterBounds.txt

@@ -3,9 +3,9 @@ package
 
 public expect fun </*0*/ T : kotlin.Comparable<T>> kotlin.Array<out T>.sort(): kotlin.Unit
 
-
 // -- Module: <m2-jvm> --
 package
 
 public fun </*0*/ T> kotlin.Array<out T>.sort(): kotlin.Unit
 public actual fun </*0*/ T : kotlin.Comparable<T>> kotlin.Array<out T>.sort(): kotlin.Unit
+

compiler/testData/diagnostics/tests/multiplatform/generic/genericMemberBounds.txt

@@ -9,7 +9,6 @@ public final expect class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -22,3 +21,4 @@ public open class JavaA {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 public actual typealias A = JavaA
+

compiler/testData/diagnostics/tests/multiplatform/generic/membersInGenericClass.txt

@@ -10,7 +10,6 @@ public expect interface A</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -22,3 +21,4 @@ public actual interface A</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.kt

@@ -5,7 +5,7 @@
 interface A
 interface B
 
-expect fun <!JVM:NO_ACTUAL_FOR_EXPECT!><T><!> List<T>.foo() where T : A, T : B
+expect fun <!NO_ACTUAL_FOR_EXPECT{JVM}!><T><!> List<T>.foo() where T : A, T : B
 
 // MODULE: m2-jvm(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.txt

@@ -15,7 +15,6 @@ public interface B {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -32,3 +31,4 @@ public interface B {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.txt

@@ -49,7 +49,6 @@ public final expect annotation class Foo7 : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -107,3 +106,4 @@ public final actual annotation class Foo6 : kotlin.Annotation {
 public actual typealias Foo1 = Bar1
 public actual typealias Foo4 = Bar2
 public actual typealias Foo7 = Bar2
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.txt

@@ -68,7 +68,6 @@ public final expect class Foo3 {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -151,3 +150,4 @@ public open class JavaFoo {
 }
 public actual typealias Bar3 = JavaBar
 public actual typealias Foo3 = JavaFoo
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/actualMissing.txt

@@ -8,7 +8,6 @@ public final expect class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m1-jvm> --
 package
 
@@ -19,3 +18,4 @@ public final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.fir.kt

@@ -10,4 +10,4 @@ open class C : A
 // FILE: jvm.kt
 
 actual open class A
-actual class B : A()
+actual class B : A()

compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.kt

@@ -4,10 +4,10 @@
 
 expect open class A
 expect class B : A
-open class C : <!JVM:SUPERTYPE_NOT_INITIALIZED, SUPERTYPE_NOT_INITIALIZED!>A<!>
+open class C : <!SUPERTYPE_NOT_INITIALIZED, SUPERTYPE_NOT_INITIALIZED{JVM}!>A<!>
 
 // MODULE: m1-jvm(m1-common)
 // FILE: jvm.kt
 
 actual open class A
-actual class B : A()
+actual class B : A()

compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.txt

@@ -20,7 +20,6 @@ public open class C : A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m1-jvm> --
 package
 
@@ -44,3 +43,4 @@ public open class C : A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/classKinds.txt

@@ -43,7 +43,6 @@ public expect object Object {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -93,3 +92,4 @@ public actual object Object {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/dontOverrideMethodsFromInterfaceInCommonCode.txt

@@ -29,7 +29,6 @@ public final expect class ImplicitFooCheck : Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -63,3 +62,4 @@ public final actual class ImplicitFooCheck : Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithoutConstructor.txt

@@ -30,7 +30,6 @@ public final expect class FooBar {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -63,3 +62,4 @@ public final actual class FooBar {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.kt

@@ -4,12 +4,12 @@
 // FILE: common.kt
 
 expect fun foo1(x: Int)
-expect fun foo2<!JVM:NO_ACTUAL_FOR_EXPECT!>(x: Int)<!>
+expect fun foo2<!NO_ACTUAL_FOR_EXPECT{JVM}!>(x: Int)<!>
 
 expect class NoArgConstructor()
 
-expect fun foo3(): <!JVM:NO_ACTUAL_FOR_EXPECT!>Int<!>
-expect fun foo4<!JVM:NO_ACTUAL_FOR_EXPECT!>()<!>: Int
+expect fun foo3(): <!NO_ACTUAL_FOR_EXPECT{JVM}!>Int<!>
+expect fun foo4<!NO_ACTUAL_FOR_EXPECT{JVM}!>()<!>: Int
 
 // MODULE: m2-jvm(m1-common)
 

compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.txt

@@ -13,7 +13,6 @@ public final expect class NoArgConstructor {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -33,3 +32,4 @@ public final actual class NoArgConstructor {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.kt

@@ -10,7 +10,7 @@ expect fun foo2(): Int
 
 expect val s: String
 
-expect open class <!JVM:AMBIGUOUS_ACTUALS, JVM:PACKAGE_OR_CLASSIFIER_REDECLARATION!>Foo3<!>
+expect open class <!AMBIGUOUS_ACTUALS{JVM}, PACKAGE_OR_CLASSIFIER_REDECLARATION{JVM}!>Foo3<!>
 
 // MODULE: m2-jvm(m1-common)
 

compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.txt

@@ -22,7 +22,6 @@ public open expect class Foo3 {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -54,3 +53,4 @@ public final class Foo3 {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFinalActualOpen.txt

@@ -16,7 +16,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -37,3 +36,4 @@ public open class JavaBar {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 public actual typealias Bar = JavaBar
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithoutExplicitOverrideOfMethod.txt

@@ -29,7 +29,6 @@ public final expect class DerivedImplicit : Base {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -64,3 +63,4 @@ public final actual class DerivedImplicit : Base {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.kt

@@ -3,7 +3,7 @@
 // FILE: common.kt
 
 expect class H {
-    <!JVM:WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET!>expect<!> fun foo()
+    <!WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET{JVM}!>expect<!> fun foo()
 }
 
 // MODULE: m1-jvm(m1-common)

compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.txt

@@ -8,7 +8,6 @@ public final expect class H {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m1-jvm> --
 package
 
@@ -19,3 +18,4 @@ public final actual class H {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/functionAndPropertyWithSameName.txt

@@ -8,7 +8,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m1-jvm> --
 package
 
@@ -20,3 +19,4 @@ public final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.txt

@@ -61,7 +61,6 @@ public expect interface C9</*0*/ K> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -76,3 +75,4 @@ public actual typealias C7</*0*/ I> = kotlin.collections.MutableList<out I>
 public actual typealias C8</*0*/ J> = kotlin.collections.MutableList<*>
 public actual typealias C9</*0*/ K> = kotlin.collections.MutableList<in K>
 public typealias Tmp</*0*/ K> = kotlin.collections.MutableList<K>
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassMember.txt

@@ -9,7 +9,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -22,7 +21,6 @@ public final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m3-js> --
 package
 
@@ -34,3 +32,4 @@ public final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/implDataClass.txt

@@ -26,7 +26,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -61,3 +60,4 @@ public final actual data class Foo {
     public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/implOpenClass.txt

@@ -10,7 +10,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -30,3 +29,4 @@ public open actual class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/modalityCheckForExplicitAndImplicitOverride.txt

@@ -22,7 +22,6 @@ public final expect class Foo3 {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -65,3 +64,4 @@ public open class WithFinal {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.txt

@@ -16,7 +16,6 @@ public open expect class Container {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -35,3 +34,4 @@ public open actual class Container {
     public final actual fun publicFun(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActualViaTypeAlias.txt

@@ -8,7 +8,6 @@ public open expect class Container {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -24,3 +23,4 @@ package foo {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClasses.txt

@@ -65,7 +65,6 @@ public expect object OuterObject {
     }
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -142,3 +141,4 @@ public actual object OuterObject {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.kt

@@ -4,15 +4,15 @@
 
 expect class B {
     class N {
-        <!EXPECTED_DECLARATION_WITH_BODY, JVM:EXPECTED_DECLARATION_WITH_BODY!>fun body()<!> {}
-        <!JVM:WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET!>expect<!> fun extraHeader()
+        <!EXPECTED_DECLARATION_WITH_BODY, EXPECTED_DECLARATION_WITH_BODY{JVM}!>fun body()<!> {}
+        <!WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET{JVM}!>expect<!> fun extraHeader()
     }
 }
 
 expect class C {
-    <!JVM:WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET!>expect<!> class N
-    <!JVM:WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET!>expect<!> enum class E
-    <!JVM:WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET!>expect<!> inner class I
+    <!WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET{JVM}!>expect<!> class N
+    <!WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET{JVM}!>expect<!> enum class E
+    <!WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET{JVM}!>expect<!> inner class I
 }
 
 expect class D {

compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.txt

@@ -71,7 +71,6 @@ public final expect class E {
     }
 }
 
-
 // -- Module: <m1-jvm> --
 package
 
@@ -149,3 +148,4 @@ public final actual class E {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.txt

@@ -8,7 +8,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -19,3 +18,4 @@ public final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.kt

@@ -3,11 +3,11 @@
 // FILE: common.kt
 
 expect class A {
-    <!EXPECTED_PRIVATE_DECLARATION, JVM:EXPECTED_PRIVATE_DECLARATION!>private<!> fun foo()
-    <!EXPECTED_PRIVATE_DECLARATION, JVM:EXPECTED_PRIVATE_DECLARATION!>private<!> val bar: String
-    <!EXPECTED_PRIVATE_DECLARATION, JVM:EXPECTED_PRIVATE_DECLARATION!>private<!> fun Int.memExt(): Any
+    <!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> fun foo()
+    <!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> val bar: String
+    <!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> fun Int.memExt(): Any
 
-    <!EXPECTED_PRIVATE_DECLARATION, JVM:EXPECTED_PRIVATE_DECLARATION!>private<!> class Nested
+    <!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> class Nested
 }
 
 // MODULE: m1-jvm(m1-common)

compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.txt

@@ -16,7 +16,6 @@ public final expect class A {
     }
 }
 
-
 // -- Module: <m1-jvm> --
 package
 
@@ -36,3 +35,4 @@ public final actual class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/simpleHeaderClass.txt

@@ -7,7 +7,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -18,7 +17,6 @@ public final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m3-js> --
 package
 
@@ -28,3 +26,4 @@ public final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.kt

@@ -8,7 +8,7 @@ interface J
 
 expect class Foo : I, C, J
 
-expect class Bar : <!JS:SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR, JVM:SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR, SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR!>C<!JS:SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS, JVM:SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS, SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS!>()<!><!>
+expect class Bar : <!SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR, SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR{JVM}, SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR{JS}!>C<!SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS, SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS{JVM}, SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS{JS}!>()<!><!>
 
 // MODULE: m2-jvm(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.txt

@@ -32,7 +32,6 @@ public interface J {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -69,7 +68,6 @@ public interface J {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m3-js> --
 package
 
@@ -105,3 +103,4 @@ public interface J {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.kt

@@ -3,7 +3,7 @@
 // FILE: common.kt
 
 class Foo {
-    <!JVM:NON_ABSTRACT_FUNCTION_WITH_NO_BODY, NON_ABSTRACT_FUNCTION_WITH_NO_BODY!><!JVM:WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET!>expect<!> fun bar(): String<!>
+    <!NON_ABSTRACT_FUNCTION_WITH_NO_BODY, NON_ABSTRACT_FUNCTION_WITH_NO_BODY{JVM}!><!WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET{JVM}!>expect<!> fun bar(): String<!>
 }
 
 // MODULE: m1-jvm(m1-common)

compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.txt

@@ -9,7 +9,6 @@ public final class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m1-jvm> --
 package
 
@@ -20,3 +19,4 @@ public final class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/implDelegatedMember.txt

@@ -8,7 +8,6 @@ public open expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -28,3 +27,4 @@ public open actual class Foo : Bar {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/implDynamic.txt

@@ -11,7 +11,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-js> --
 package
 
@@ -24,3 +23,4 @@ public final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/implFakeOverride.txt

@@ -8,7 +8,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -27,3 +26,4 @@ public final actual class Foo : Bar {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.kt

@@ -8,7 +8,7 @@ expect inline class Foo1(val x: Int) {
 
 expect inline class Foo2(val x: Int)
 
-expect <!ABSENCE_OF_PRIMARY_CONSTRUCTOR_FOR_INLINE_CLASS, JVM:ABSENCE_OF_PRIMARY_CONSTRUCTOR_FOR_INLINE_CLASS!>inline<!> class Foo3
+expect <!ABSENCE_OF_PRIMARY_CONSTRUCTOR_FOR_INLINE_CLASS, ABSENCE_OF_PRIMARY_CONSTRUCTOR_FOR_INLINE_CLASS{JVM}!>inline<!> class Foo3
 
 expect class NonInlineExpect
 

compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.txt

@@ -38,7 +38,6 @@ public final expect class NonInlineExpect {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -81,3 +80,4 @@ public final actual inline class NonInlineExpect {
     public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/java/flexibleTypes.txt

@@ -11,7 +11,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -25,3 +24,4 @@ public open class FooImpl {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 public actual typealias Foo = FooImpl
+

compiler/testData/diagnostics/tests/multiplatform/java/parameterNames.txt

@@ -8,7 +8,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -20,3 +19,4 @@ public open class FooImpl {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 public actual typealias Foo = FooImpl
+

compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.txt

@@ -19,7 +19,6 @@ public final class Outer {
 }
 public typealias Foo = kotlin.String
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -38,3 +37,4 @@ public final class Outer {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+

compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt

@@ -12,9 +12,9 @@ expect class Foo(zzz: Int) {
 expect fun f2(xxx: Int)
 
 fun testCommon() {
-    Foo(<!OI;NAMED_ARGUMENTS_NOT_ALLOWED!>zzz<!> = 0)
-    val f = Foo(<!OI;NAMED_ARGUMENTS_NOT_ALLOWED!>aaa<!> = true)
-    f.f1(<!OI;NAMED_ARGUMENTS_NOT_ALLOWED!>xxx<!> = "")
+    Foo(<!NAMED_ARGUMENTS_NOT_ALLOWED{OI}!>zzz<!> = 0)
+    val f = Foo(<!NAMED_ARGUMENTS_NOT_ALLOWED{OI}!>aaa<!> = true)
+    f.f1(<!NAMED_ARGUMENTS_NOT_ALLOWED{OI}!>xxx<!> = "")
     f2(xxx = 42)
 }
 

compiler/testData/diagnostics/tests/multiplatform/namedArguments.txt

@@ -13,7 +13,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -30,3 +29,4 @@ public final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.kt

@@ -2,11 +2,11 @@
 // MODULE: m1-common
 // FILE: common.kt
 
-<!EXPECTED_PRIVATE_DECLARATION, JVM:EXPECTED_PRIVATE_DECLARATION!>private<!> expect fun foo()
-<!EXPECTED_PRIVATE_DECLARATION, JVM:EXPECTED_PRIVATE_DECLARATION!>private<!> expect val bar: String
-<!EXPECTED_PRIVATE_DECLARATION, JVM:EXPECTED_PRIVATE_DECLARATION!>private<!> expect fun Int.memExt(): Any
+<!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> expect fun foo()
+<!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> expect val bar: String
+<!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> expect fun Int.memExt(): Any
 
-<!EXPECTED_PRIVATE_DECLARATION, JVM:EXPECTED_PRIVATE_DECLARATION!>private<!> expect class Foo
+<!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> expect class Foo
 
 // MODULE: m2-jvm(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.txt

@@ -11,7 +11,6 @@ private final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -25,3 +24,4 @@ private final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/multiplatform/sealedTypeAlias.txt

@@ -19,7 +19,6 @@ public sealed expect class Presence {
     }
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -44,3 +43,4 @@ public sealed class P {
     }
 }
 public actual typealias Presence = P
+

compiler/testData/diagnostics/tests/multiplatform/sealedTypeAliasTopLevel.txt

@@ -19,7 +19,6 @@ public sealed expect class Presence {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -44,3 +43,4 @@ public sealed class P {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 public actual typealias Presence = P
+

compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callHeaderFun.txt

@@ -4,7 +4,6 @@ package
 public fun callFromCommonCode(/*0*/ x: kotlin.Int): kotlin.Int
 public expect fun foo(/*0*/ x: kotlin.Int): kotlin.Int
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -12,10 +11,10 @@ public fun callFromCommonCode(/*0*/ x: kotlin.Int): kotlin.Int
 public fun callFromJVM(/*0*/ x: kotlin.Int): kotlin.Int
 public actual fun foo(/*0*/ x: kotlin.Int): kotlin.Int
 
-
 // -- Module: <m3-js> --
 package
 
 public fun callFromCommonCode(/*0*/ x: kotlin.Int): kotlin.Int
 public fun callFromJS(/*0*/ x: kotlin.Int): kotlin.Int
 public actual fun foo(/*0*/ x: kotlin.Int): kotlin.Int
+

compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.kt

@@ -9,7 +9,7 @@ expect fun foo(): String
 fun g(f: () -> String): String = f()
 
 fun test() {
-    g(::<!JVM:DEPRECATION!>foo<!>)
+    g(::<!DEPRECATION{JVM}!>foo<!>)
 }
 
 // MODULE: m2-jvm(m1-common)

compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.txt

@@ -7,7 +7,6 @@ package test {
     public fun test(): kotlin.Unit
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -16,3 +15,4 @@ package test {
     public fun g(/*0*/ f: () -> kotlin.String): kotlin.String
     public fun test(): kotlin.Unit
 }
+

compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.kt

@@ -2,7 +2,7 @@
 // MODULE: m1-common
 // FILE: common.kt
 
-expect fun <!JS:AMBIGUOUS_ACTUALS, JVM:AMBIGUOUS_ACTUALS!>foo<!>()
+expect fun <!AMBIGUOUS_ACTUALS{JVM}, AMBIGUOUS_ACTUALS{JS}!>foo<!>()
 
 // MODULE: m2-jvm(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.txt

@@ -3,16 +3,15 @@ package
 
 public expect fun foo(): kotlin.Unit
 
-
 // -- Module: <m2-jvm> --
 package
 
 public actual fun foo(): kotlin.Unit
 public actual fun foo(): kotlin.Unit
 
-
 // -- Module: <m3-js> --
 package
 
 public actual fun foo(): kotlin.Unit
 public actual fun foo(): kotlin.Unit
+

compiler/testData/diagnostics/tests/multiplatform/topLevelFun/functionModifiers.txt

@@ -7,7 +7,6 @@ public expect fun tailrec(): kotlin.Unit
 public expect fun kotlin.String.and(/*0*/ other: kotlin.String): kotlin.String
 public expect fun kotlin.String.unaryMinus(): kotlin.String
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -16,3 +15,4 @@ public actual inline fun inline(): kotlin.Unit
 public actual tailrec fun tailrec(): kotlin.Unit
 public actual infix fun kotlin.String.and(/*0*/ other: kotlin.String): kotlin.String
 public actual operator fun kotlin.String.unaryMinus(): kotlin.String
+

compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.kt

@@ -3,7 +3,7 @@
 // FILE: common.kt
 package common
 
-expect fun <!JS:NO_ACTUAL_FOR_EXPECT, JVM:NO_ACTUAL_FOR_EXPECT!>foo<!>()
+expect fun <!NO_ACTUAL_FOR_EXPECT{JVM}, NO_ACTUAL_FOR_EXPECT{JS}!>foo<!>()
 
 // MODULE: m2-jvm(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.txt

@@ -5,7 +5,6 @@ package common {
     public expect fun foo(): kotlin.Unit
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -13,10 +12,10 @@ package jvm {
     public actual fun foo(): kotlin.Unit
 }
 
-
 // -- Module: <m3-js> --
 package
 
 package js {
     public actual fun foo(): kotlin.Unit
 }
+

compiler/testData/diagnostics/tests/multiplatform/topLevelFun/implDeclarationWithoutBody.txt

@@ -3,9 +3,9 @@ package
 
 public expect fun foo(): kotlin.Unit
 
-
 // -- Module: <m2-jvm> --
 package
 
 public actual fun bar(): kotlin.Unit
 public actual fun foo(): kotlin.Unit
+

compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.txt

@@ -4,16 +4,15 @@ package
 public expect inline fun inlineFun(): kotlin.Unit
 public expect fun nonInlineFun(): kotlin.Unit
 
-
 // -- Module: <m2-jvm> --
 package
 
 public actual fun inlineFun(): kotlin.Unit
 public actual fun nonInlineFun(): kotlin.Unit
 
-
 // -- Module: <m3-js> --
 package
 
 public actual inline fun inlineFun(): kotlin.Unit
 public actual inline fun nonInlineFun(): kotlin.Unit
+

compiler/testData/diagnostics/tests/multiplatform/topLevelFun/simpleHeaderFun.txt

@@ -3,14 +3,13 @@ package
 
 public expect fun foo(): kotlin.Unit
 
-
 // -- Module: <m2-jvm> --
 package
 
 public actual fun foo(): kotlin.Unit
 
-
 // -- Module: <m3-js> --
 package
 
 public actual fun foo(): kotlin.Unit
+

compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.kt

@@ -11,8 +11,8 @@ expect fun f4(s: () -> String)
 expect inline fun f5(s: () -> String)
 expect inline fun f6(crossinline s: () -> String)
 
-expect fun f7<!JVM:NO_ACTUAL_FOR_EXPECT!>(x: Any)<!>
-expect fun f8<!JVM:NO_ACTUAL_FOR_EXPECT!>(vararg x: Any)<!>
+expect fun f7<!NO_ACTUAL_FOR_EXPECT{JVM}!>(x: Any)<!>
+expect fun f8<!NO_ACTUAL_FOR_EXPECT{JVM}!>(vararg x: Any)<!>
 
 // MODULE: m2-jvm(m1-common)
 // FILE: jvm.kt

compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.txt

@@ -10,7 +10,6 @@ public expect inline fun f6(/*0*/ crossinline s: () -> kotlin.String): kotlin.Un
 public expect fun f7(/*0*/ x: kotlin.Any): kotlin.Unit
 public expect fun f8(/*0*/ vararg x: kotlin.Any /*kotlin.Array<out kotlin.Any>*/): kotlin.Unit
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -22,3 +21,4 @@ public actual inline fun f5(/*0*/ crossinline s: () -> kotlin.String): kotlin.Un
 public actual inline fun f6(/*0*/ s: () -> kotlin.String): kotlin.Unit
 public actual fun f7(/*0*/ vararg x: kotlin.Any /*kotlin.Array<out kotlin.Any>*/): kotlin.Unit
 public actual fun f8(/*0*/ x: kotlin.Any): kotlin.Unit
+

compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/simpleHeaderVar.txt

@@ -3,14 +3,13 @@ package
 
 public expect var foo: kotlin.String
 
-
 // -- Module: <m2-jvm> --
 package
 
 public actual var foo: kotlin.String
 
-
 // -- Module: <m3-js> --
 package
 
 public actual var foo: kotlin.String
+