diff --git a/compiler/testData/diagnostics/tests/multiplatform/scopes/manyImplMemberNotImplemented.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/scopes/manyImplMemberNotImplemented.fir.kt index 7bf6a31fb27..03c701e8a50 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/scopes/manyImplMemberNotImplemented.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/scopes/manyImplMemberNotImplemented.fir.kt @@ -1,5 +1,8 @@ // TARGET_BACKEND: JVM // LANGUAGE: +MultiPlatformProjects +// IGNORE_DIAGNOSTIC_API +// IGNORE_REVERSED_RESOLVE +// Reason: MPP diagnostics are reported differentely in the compiler and AA // MODULE: m1-common // FILE: common.kt @@ -7,8 +10,8 @@ expect open class C1() expect interface I1 -open class Common1_1 : C1(), I1 -open class Common1_2 : I1, C1() +open class Common1_1 : C1(), I1 +open class Common1_2 : I1, C1() expect open class Expect1_1 : C1, I1 expect open class Expect1_2 : I1, C1 diff --git a/compiler/testData/diagnostics/tests/multiplatform/scopes/manyImplMemberNotImplemented.kt b/compiler/testData/diagnostics/tests/multiplatform/scopes/manyImplMemberNotImplemented.kt index 91ead3474b5..3fbfbd2c62b 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/scopes/manyImplMemberNotImplemented.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/scopes/manyImplMemberNotImplemented.kt @@ -1,5 +1,8 @@ // TARGET_BACKEND: JVM // LANGUAGE: +MultiPlatformProjects +// IGNORE_DIAGNOSTIC_API +// IGNORE_REVERSED_RESOLVE +// Reason: MPP diagnostics are reported differentely in the compiler and AA // MODULE: m1-common // FILE: common.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/scopes/manyInterfacesMemberNotImplemented.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/scopes/manyInterfacesMemberNotImplemented.fir.kt index 273deca4159..9a8609119df 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/scopes/manyInterfacesMemberNotImplemented.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/scopes/manyInterfacesMemberNotImplemented.fir.kt @@ -1,5 +1,8 @@ // TARGET_BACKEND: JVM // !LANGUAGE: +MultiPlatformProjects +// IGNORE_DIAGNOSTIC_API +// IGNORE_REVERSED_RESOLVE +// Reason: MPP diagnostics are reported differentely in the compiler and AA // MODULE: common // TARGET_PLATFORM: Common @@ -8,7 +11,7 @@ expect interface S1 expect interface S2 -open class A : S1, S2 +open class A : S1, S2 class B : A() diff --git a/compiler/testData/diagnostics/tests/multiplatform/scopes/manyInterfacesMemberNotImplemented.kt b/compiler/testData/diagnostics/tests/multiplatform/scopes/manyInterfacesMemberNotImplemented.kt index db8b3d83aad..ca0ecfaef68 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/scopes/manyInterfacesMemberNotImplemented.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/scopes/manyInterfacesMemberNotImplemented.kt @@ -1,5 +1,8 @@ // TARGET_BACKEND: JVM // !LANGUAGE: +MultiPlatformProjects +// IGNORE_DIAGNOSTIC_API +// IGNORE_REVERSED_RESOLVE +// Reason: MPP diagnostics are reported differentely in the compiler and AA // MODULE: common // TARGET_PLATFORM: Common diff --git a/compiler/testData/diagnostics/tests/multiplatform/scopes/mixedFunctionalTypesInSupertypes.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/scopes/mixedFunctionalTypesInSupertypes.fir.kt index e0ad087f345..a9f6bdb8f51 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/scopes/mixedFunctionalTypesInSupertypes.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/scopes/mixedFunctionalTypesInSupertypes.fir.kt @@ -1,4 +1,7 @@ // LANGUAGE: +MultiPlatformProjects +// IGNORE_DIAGNOSTIC_API +// IGNORE_REVERSED_RESOLVE +// Reason: MPP diagnostics are reported differentely in the compiler and AA // MODULE: common // FILE: common.kt @@ -10,9 +13,9 @@ expect interface I2 { suspend fun invoke(): R } -expect interface ExpectInterface : I1, I2 +expect interface ExpectInterface : I1, I2 -interface CommonInterface : I1, I2 +interface CommonInterface : I1, I2 // MODULE: jvm()()(common) // FILE: main.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/scopes/mixedFunctionalTypesInSupertypes.kt b/compiler/testData/diagnostics/tests/multiplatform/scopes/mixedFunctionalTypesInSupertypes.kt index a742cb16622..3f74976994c 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/scopes/mixedFunctionalTypesInSupertypes.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/scopes/mixedFunctionalTypesInSupertypes.kt @@ -1,4 +1,7 @@ // LANGUAGE: +MultiPlatformProjects +// IGNORE_DIAGNOSTIC_API +// IGNORE_REVERSED_RESOLVE +// Reason: MPP diagnostics are reported differentely in the compiler and AA // MODULE: common // FILE: common.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/scopes/multipleDefaultsInhereted.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/scopes/multipleDefaultsInhereted.fir.kt new file mode 100644 index 00000000000..9256b1aad85 --- /dev/null +++ b/compiler/testData/diagnostics/tests/multiplatform/scopes/multipleDefaultsInhereted.fir.kt @@ -0,0 +1,38 @@ +// LANGUAGE: +MultiPlatformProjects + +// MODULE: m1-common +// FILE: common.kt +expect interface I1 { + fun foo(x: Int = 1) + fun bar(x: Int = 1) +} + +expect interface I2 { + fun foo(x: Int = 2) + fun bar(x: Int = 2) +} + +expect interface ExpectInterface : I1, I2 { + override fun foo(x: Int) +} + +interface CommonInterface : I1, I2 { + override fun foo(x: Int) +} + +// MODULE: m1-jvm()()(m1-common) +// FILE: main.kt + +actual interface I1 { + actual fun foo(x: Int) + actual fun bar(x: Int) +} + +actual interface I2 { + actual fun foo(x: Int) + actual fun bar(x: Int) +} + +actual interface ExpectInterface : I1, I2 { + actual override fun foo(x: Int) +} diff --git a/compiler/testData/diagnostics/tests/multiplatform/scopes/multipleDefaultsInhereted.kt b/compiler/testData/diagnostics/tests/multiplatform/scopes/multipleDefaultsInhereted.kt index eac07ae21e6..5779bea918a 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/scopes/multipleDefaultsInhereted.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/scopes/multipleDefaultsInhereted.kt @@ -1,4 +1,3 @@ -// FIR_IDENTICAL // LANGUAGE: +MultiPlatformProjects // MODULE: m1-common diff --git a/compiler/testData/diagnostics/tests/multiplatform/scopes/scopeOfFunInterface.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/scopes/scopeOfFunInterface.fir.kt index f6cf81cc443..3a9d76bd3b7 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/scopes/scopeOfFunInterface.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/scopes/scopeOfFunInterface.fir.kt @@ -1,11 +1,14 @@ // LANGUAGE: +MultiPlatformProjects // ISSUE: KT-58845 +// IGNORE_DIAGNOSTIC_API +// IGNORE_REVERSED_RESOLVE +// Reason: MPP diagnostics are reported differentely in the compiler and AA // MODULE: common // FILE: common.kt expect interface I -fun interface F : I { +fun interface F : I { fun foo() } @@ -14,4 +17,4 @@ fun interface F : I { actual interface I { fun bar() -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/multiplatform/scopes/scopeOfFunInterface.kt b/compiler/testData/diagnostics/tests/multiplatform/scopes/scopeOfFunInterface.kt index a2718c6a08a..bbbd7a20dd1 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/scopes/scopeOfFunInterface.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/scopes/scopeOfFunInterface.kt @@ -1,5 +1,8 @@ // LANGUAGE: +MultiPlatformProjects // ISSUE: KT-58845 +// IGNORE_DIAGNOSTIC_API +// IGNORE_REVERSED_RESOLVE +// Reason: MPP diagnostics are reported differentely in the compiler and AA // MODULE: common // FILE: common.kt