[Test] Introduce new syntax for dependsOn dependencies

compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/Modules.kt

@@ -18,11 +18,17 @@ data class TestModule(
     val frontendKind: FrontendKind<*>,
     val binaryKind: BinaryKind<*>,
     val files: List<TestFile>,
-    val dependencies: List<DependencyDescription>,
+    val allDependencies: List<DependencyDescription>,
-    val friends: List<DependencyDescription>,
     val directives: RegisteredDirectives,
     val languageVersionSettings: LanguageVersionSettings
 ) {
+    val regularDependencies: List<DependencyDescription>
+        get() = allDependencies.filter { it.relation == DependencyRelation.RegularDependency }
+    val friendDependencies: List<DependencyDescription>
+        get() = allDependencies.filter { it.relation == DependencyRelation.FriendDependency }
+    val dependsOnDependencies: List<DependencyDescription>
+        get() = allDependencies.filter { it.relation == DependencyRelation.DependsOnDependency }
+
     override fun equals(other: Any?): Boolean =
         other is TestModule && name == other.name
 
@@ -33,7 +39,7 @@ data class TestModule(
             appendLine("Module: $name")
             appendLine("targetPlatform = $targetPlatform")
             appendLine("Dependencies:")
-            dependencies.forEach { appendLine("  $it") }
+            allDependencies.forEach { appendLine("  $it") }
             appendLine("Directives:\n  $directives")
             files.forEach { appendLine(it) }
         }
@@ -56,8 +62,9 @@ class TestFile(
 }
 
 enum class DependencyRelation {
-    Dependency,
+    RegularDependency,
-    DependsOn
+    FriendDependency,
+    DependsOnDependency
 }
 
 enum class DependencyKind {

compiler/testData/codegen/box/multiplatform/exhaustiveness/commonEnum.kt

@@ -16,7 +16,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: main.kt
 
 fun testPlatform(base: Base) {

compiler/testData/codegen/box/multiplatform/exhaustiveness/commonSealedClass.kt

@@ -17,7 +17,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: main.kt
 
 fun testPlatform(base: Base) {

compiler/testData/codegen/box/multiplatform/exhaustiveness/commonSealedInterface.kt

@@ -17,7 +17,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: main.kt
 
 fun testPlatform(base: Base) {

compiler/testData/codegen/box/multiplatform/starImportOfExpectEnumWithActualTypeAlias.kt

@@ -11,7 +11,7 @@ package test
 
 expect enum class E
 
-// MODULE: lib-jvm(lib-common)
+// MODULE: lib-jvm()()(lib-common)
 // FILE: jvm.kt
 
 package test

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

@@ -47,7 +47,7 @@ expect annotation class ClassArrays(
     vararg val v: Int = [42]
 )
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 import kotlin.reflect.KClass

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.fir.kt

@@ -19,7 +19,7 @@ expect annotation class A5(val x: Int = 42, val y: String)
 @A5(0, "")
 fun test() {}
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual annotation class A1(actual val x: Int, actual val y: String)

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

@@ -19,7 +19,7 @@ expect annotation class A5(val x: Int = 42, val y: String)
 @A5(0, "")
 fun test() {}
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual annotation class A1(actual val x: Int, actual val y: String)

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.fir.kt

@@ -19,7 +19,7 @@ expect annotation class A5(val x: Int = 42, val y: String)
 @A5(0, "")
 fun test() {}
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual typealias A1 = J1

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

@@ -19,7 +19,7 @@ expect annotation class A5(val x: Int = 42, val y: String)
 @A5(0, "")
 fun test() {}
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual typealias A1 = J1

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

@@ -43,7 +43,7 @@ annotation class A(val value: String)
 @Anno
 fun test() {}
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual typealias Anno = Jnno

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.fir.kt

@@ -13,7 +13,7 @@ fun test() {
     Ok(42, "OK")
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Ok actual constructor(x: Int, y: String)

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

@@ -13,7 +13,7 @@ fun test() {
     Ok(42, "OK")
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Ok actual constructor(x: Int, y: String)

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.fir.kt

@@ -23,7 +23,7 @@ fun test(foo: Foo) {
     foo.ok(42, "OK")
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual fun ok(x: Int, y: String) {}

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

@@ -23,7 +23,7 @@ fun test(foo: Foo) {
     foo.ok(42, "OK")
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual fun ok(x: Int, y: String) {}

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.fir.kt

@@ -25,7 +25,7 @@ fun test(foo: Foo, bar: Bar) {
     bar.ok(42, "OK")
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Bar : Foo {

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

@@ -25,7 +25,7 @@ fun test(foo: Foo, bar: Bar) {
     bar.ok(42, "OK")
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Bar : Foo {

compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedVsNonExpectedWithDefaults.fir.kt

@@ -5,7 +5,7 @@
 
 expect fun ok(x: Int, y: String = "")
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual fun ok(x: Int, y: String) {}

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

@@ -5,7 +5,7 @@
 
 expect fun ok(x: Int, y: String = "")
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual fun ok(x: Int, y: String) {}

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

@@ -14,7 +14,7 @@ header enum class E {
     FIRST
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 impl class My

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

@@ -14,7 +14,7 @@
     FIRST
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 <!DEPRECATED_MODIFIER!>impl<!> class My

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

@@ -5,7 +5,7 @@
 expect enum class Foo { A, B }
 expect enum class Bar { X, Y, Z }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual enum class Foo { A, B, C, D, E }
 actual enum class Bar { V, X, W, Y, Z }

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

@@ -5,7 +5,7 @@
 expect enum class Foo { A, B }
 expect enum class Bar { X, Y, Z }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual enum class Foo { B, A }
 actual enum class Bar { X, Z, Y }

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

@@ -8,7 +8,7 @@ expect enum class Foo {
 
 expect enum class _TimeUnit
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual typealias Foo = FooImpl
 

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

@@ -8,7 +8,7 @@ expect enum class Foo {
     ENTRY3;
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual enum class Foo(val x: String) {
     ENTRY1("1"),

compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/commonSealedWithPlatformInheritor.fir.kt

@@ -10,7 +10,7 @@ fun test_1(b: Base) = when (b) {
     is Derived -> 1
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 
 class PlatfromDerived : Base() // must be an error
 

compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/commonSealedWithPlatformInheritor.kt

@@ -10,7 +10,7 @@ fun test_1(b: Base) = <!NO_ELSE_IN_WHEN{JVM}!>when<!> (b) {
     is Derived -> 1
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 
 class PlatfromDerived : <!SEALED_INHERITOR_IN_DIFFERENT_MODULE!>Base<!>() // must be an error
 

compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectEnum.fir.kt

@@ -15,7 +15,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: Base.kt
 actual enum class Base {
     A, B, C

compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectEnum.kt

@@ -15,7 +15,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: Base.kt
 actual enum class Base {
     A, B, C

compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClass.fir.kt

@@ -16,7 +16,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: Base.kt
 actual sealed class Base
 

compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClass.kt

@@ -16,7 +16,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: Base.kt
 actual sealed class Base
 

compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedClassWithActualTypealias.kt

@@ -8,7 +8,7 @@ expect sealed class SealedClass()
 
 class Derived1 : SealedClass()
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 actual typealias SealedClass = MySealedClass
 
 sealed class MySealedClass

compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedInterface.fir.kt

@@ -16,7 +16,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: Base.kt
 actual sealed interface Base
 

compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectSealedInterface.kt

@@ -16,7 +16,7 @@ fun testCommon(base: Base) {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: Base.kt
 actual sealed interface Base
 

compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/kt45796.fir.kt

@@ -15,7 +15,7 @@ fun whenForExpectSealed(s: SealedClass): Int {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 actual sealed class SealedClass {
     actual class Nested : SealedClass() {
         actual class NestedDeeper : SealedClass()

compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/kt45796.kt

@@ -15,7 +15,7 @@ fun whenForExpectSealed(s: SealedClass): Int {
     }
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 actual sealed class SealedClass {
     actual class Nested : SealedClass() {
         actual class NestedDeeper : SealedClass()

compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.fir.kt

@@ -12,7 +12,7 @@ expect interface My {
     abstract val abstractVal: Int
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 actual interface My {
     actual fun openFunPositive() = Unit

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

@@ -12,7 +12,7 @@ expect interface My {
     abstract val abstractVal: Int
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 actual interface My {
     actual fun openFunPositive() = Unit

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

@@ -5,7 +5,7 @@
 
 expect fun <T : Comparable<T>> Array<out T>.sort(): Unit
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual fun <T : Comparable<T>> Array<out T>.sort(): Unit {}

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

@@ -9,7 +9,7 @@ expect class A {
     fun <S : Comparable<S>> bar(): List<S>
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual typealias A = JavaA

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

@@ -9,7 +9,7 @@ expect interface A<T> {
     fun f(p: Collection<T>): Map<T, A<T?>>
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual interface A<T> {

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

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

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

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

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

@@ -16,7 +16,7 @@ fun foo() {}
 @Foo5
 fun bar() {}
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: Bar1.java
 
@@ -45,4 +45,4 @@ actual annotation class Foo5
 
 actual annotation class Foo6(val s: String = "value")
 
-actual typealias Foo7 = Bar2
+actual typealias Foo7 = Bar2

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

@@ -16,7 +16,7 @@ fun foo() {}
 @Foo5
 fun bar() {}
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: Bar1.java
 
@@ -45,4 +45,4 @@ actual annotation class Foo5
 
 actual annotation class Foo6(val s: String = "value")
 
-actual typealias <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>Foo7<!> = Bar2
+actual typealias <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>Foo7<!> = Bar2

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

@@ -14,7 +14,7 @@ expect class Bar5()
 expect class Bar6()
 expect class Bar7(s: String)
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: JavaFoo.java
 

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

@@ -14,7 +14,7 @@ expect class Bar5()
 expect class Bar6()
 expect class Bar7(s: String)
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: JavaFoo.java
 

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

@@ -6,7 +6,7 @@ expect class A {
     fun foo()
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 class A {

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

@@ -6,7 +6,7 @@ expect class A {
     fun foo()
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 class <!ACTUAL_MISSING!>A<!> {

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

@@ -6,7 +6,7 @@ expect open class A
 expect class B : A
 open class C : <!SUPERTYPE_NOT_INITIALIZED!>A<!>
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual open class A

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

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

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

@@ -13,7 +13,7 @@ expect class Class
 
 expect enum class En { ENTRY }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual interface Interface

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

@@ -15,7 +15,7 @@ expect class ExplicitFoo : Foo {
 
 expect class ImplicitFooCheck : Foo
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class ImplicitFoo : Foo {
@@ -26,4 +26,4 @@ actual class ExplicitFoo : Foo {
     actual override fun foo() {}
 }
 
-actual <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class ImplicitFooCheck<!> : Foo
+actual <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class ImplicitFooCheck<!> : Foo

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

@@ -16,10 +16,10 @@ fun test() {
     FooBar()
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Foo
 actual class Bar
 actual class Baz
-actual class FooBar
+actual class FooBar

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

@@ -16,10 +16,10 @@ fun test() {
     FooBar()
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Foo
 actual class Bar
 actual class Baz
-actual class FooBar
+actual class FooBar

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

@@ -11,7 +11,7 @@ expect class NoArgConstructor()
 expect fun foo3(): Int
 expect fun foo4(): Int
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: jvm.kt
 

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

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

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

@@ -12,7 +12,7 @@ expect val s: String
 
 expect open class Foo3
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: jvm.kt
 

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

@@ -12,7 +12,7 @@ expect val s: String
 
 expect open class <!AMBIGUOUS_ACTUALS{JVM}, PACKAGE_OR_CLASSIFIER_REDECLARATION{JVM}!>Foo3<!>
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: jvm.kt
 

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

@@ -12,7 +12,7 @@ expect class Bar {
     fun g()
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual open class Foo(actual open val v: String) {

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

@@ -16,7 +16,7 @@ expect class DerivedExplicitCheck : Base {
     override fun foo()
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual abstract class Base {
@@ -33,4 +33,4 @@ actual class DerivedExplicit : Base() {
 
 actual class DerivedExplicitCheck : Base() {
     override fun foo() {}
-}
+}

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

@@ -16,7 +16,7 @@ expect class DerivedExplicitCheck : Base {
     override fun foo()
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual abstract class Base {
@@ -33,4 +33,4 @@ actual class DerivedExplicit : Base() {
 
 actual class DerivedExplicitCheck : Base() {
     override fun <!ACTUAL_MISSING!>foo<!>() {}
-}
+}

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

@@ -6,7 +6,7 @@ expect class H {
     expect fun foo()
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class H {

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

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

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

@@ -7,7 +7,7 @@ expect class Foo {
     val bar: String
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Foo {

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

@@ -14,7 +14,7 @@ expect interface C8<J>
 expect interface C9<K>
 expect interface C10<L>
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual typealias C1 = String

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

@@ -14,7 +14,7 @@ expect interface C8<J>
 expect interface C9<K>
 expect interface C10<L>
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual typealias C1 = String

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

@@ -8,7 +8,7 @@ expect class Foo {
     fun bar(x: Int): Int
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual class Foo {
     actual val foo: String = "JVM"
@@ -16,7 +16,7 @@ actual class Foo {
     actual fun bar(x: Int): Int = x + 1
 }
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 actual class Foo {
     actual val foo: String = "JS"

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

@@ -23,7 +23,7 @@ expect class Baz(w: List<String>) {
     override fun toString(): String
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual data class Foo actual constructor(actual val x: Int, actual val y: String)

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

@@ -9,7 +9,7 @@ expect fun getFoo(): Foo
 
 fun <T : Foo> bar() {} // no "Foo is final" warning should be here
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual open class Foo

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

@@ -14,7 +14,7 @@ expect class Foo3 {
     val x: String
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: jvm.kt
 

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

@@ -14,7 +14,7 @@ expect class Foo3 {
     val x: String
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: jvm.kt
 

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

@@ -18,7 +18,7 @@ expect open class Container {
     open fun openPublicFun()
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: jvm.kt
 
@@ -36,4 +36,4 @@ actual open class Container {
 
     actual open fun openInternalFun() {}    // BAD: internal+open -> public
     actual internal fun openPublicFun() {}  // BAD: open+public -> internal
-}
+}

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

@@ -18,7 +18,7 @@ expect open class Container {
     open fun openPublicFun()
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: jvm.kt
 
@@ -36,4 +36,4 @@ actual open class Container {
 
     actual open fun <!ACTUAL_WITHOUT_EXPECT!>openInternalFun<!>() {}    // BAD: internal+open -> public
     actual internal fun <!ACTUAL_WITHOUT_EXPECT!>openPublicFun<!>() {}  // BAD: open+public -> internal
-}
+}

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

@@ -8,7 +8,7 @@ expect open class Container {
     internal fun internalFun()
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 
 // FILE: foo/Foo.java
 
@@ -20,4 +20,4 @@ public class Foo {
 
 // FILE: jvm.kt
 
-actual typealias Container = foo.Foo
+actual typealias Container = foo.Foo

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

@@ -37,7 +37,7 @@ expect object OuterObject {
     object NestedObject
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class OuterClass {

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

@@ -37,7 +37,7 @@ expect object OuterObject {
     object NestedObject
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class OuterClass {

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

@@ -23,7 +23,7 @@ expect class E {
     class N
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class B {

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

@@ -23,7 +23,7 @@ expect class E {
     class N
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class B {

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

@@ -6,7 +6,7 @@ expect class Foo {
     fun bar(): String
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Foo {

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

@@ -6,7 +6,7 @@ expect class Foo {
     fun bar(): String
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Foo {

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

@@ -10,7 +10,7 @@ expect class A {
     private class Nested
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class A {

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

@@ -10,7 +10,7 @@ expect class A {
     <!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> class Nested
 }
 
-// MODULE: m1-jvm(m1-common)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class A {

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

@@ -4,10 +4,10 @@
 // FILE: common.kt
 expect class Foo
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual class Foo
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 actual class Foo

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

@@ -10,13 +10,13 @@ expect class Foo : I, C, J
 
 expect class Bar : C()
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual class Foo : I, C(), J
 
 actual class Bar
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 actual class Foo : I, J, C()
 

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

@@ -10,13 +10,13 @@ expect class Foo : I, C, J
 
 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)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 actual class Foo : I, C(), J
 
 actual class <!ACTUAL_WITHOUT_EXPECT!>Bar<!>
 
-// MODULE: m3-js(m1-common)
+// MODULE: m3-js()()(m1-common)
 // FILE: js.kt
 actual class Foo : I, J, C()
 

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

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

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

@@ -6,5 +6,5 @@ class Foo {
     <!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)
+// MODULE: m1-jvm()()(m1-common)
 // FILE: jvm.kt

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

@@ -7,7 +7,7 @@ expect open class Foo {
     open fun bar(): String
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 interface Bar {

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

@@ -14,7 +14,7 @@ expect class Foo {
     fun <T : Set<Number>> f3(t: T): T?
 }
 
-// MODULE: m2-js(m1-common)
+// MODULE: m2-js()()(m1-common)
 // FILE: js.kt
 
 // TODO: do not suppress UNSUPPORTED once JS files in multi-platform tests are analyzed with JS analyzer facade

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

@@ -7,7 +7,7 @@ expect class Foo {
     fun bar(): String
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 open class Bar {

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

@@ -14,7 +14,7 @@ expect class NonInlineExpect
 
 expect inline class NonInlineActual(val x: Int)
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual inline class Foo1(val x: Int) {

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

@@ -14,7 +14,7 @@ expect class NonInlineExpect
 
 expect inline class NonInlineActual(val x: Int)
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual inline class Foo1(val x: Int) {

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

@@ -10,7 +10,7 @@ annotation class JvmInline
 
 expect value class VC(val a: Any)
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 package kotlin.jvm

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

@@ -13,7 +13,7 @@ expect class Foo {
     fun <T : Set<Number>> f3(t: T): T?
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: FooImpl.java
 
 import java.util.*;

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

@@ -7,7 +7,7 @@ expect class Foo {
     fun foo(i: Int, d: Double, f: Float): Unit
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: FooImpl.java
 
 public class FooImpl {

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

@@ -18,7 +18,7 @@ fun testCommon() {
     f2(<!NAMED_ARGUMENTS_NOT_ALLOWED!>xxx<!> = 42)
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Foo actual constructor(val aaa: Boolean) {

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

@@ -18,7 +18,7 @@ fun testCommon() {
     f2(xxx = 42)
 }
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 actual class Foo actual constructor(val aaa: Boolean) {

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

@@ -8,7 +8,7 @@
 
 private expect class Foo
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 private actual fun foo() {}

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

@@ -8,7 +8,7 @@
 
 <!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> expect class Foo
 
-// MODULE: m2-jvm(m1-common)
+// MODULE: m2-jvm()()(m1-common)
 // FILE: jvm.kt
 
 private actual fun foo() {}