[FIR] Update few MPP diagnostic tests

Updated tests contain errors which are incompatible with fir2ir conversion
  (like `PACKAGE_OR_CLASSIFIER_REDECLARATION` and `EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE`),
  so running fir2ir on such code may lead to exceptions
This commit is contained in:
Dmitriy Novozhilov
2023-11-15 14:46:07 +02:00
committed by Space Team
parent 3dff232710
commit d85d671b26
6 changed files with 11 additions and 136 deletions
@@ -2,14 +2,14 @@
// MODULE: m1-common
// FILE: common.kt
<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect class Foo1<!>
<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect class Foo2<!>
expect class Foo1
expect class Foo2
expect fun foo2(): Int
<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect val s: String<!>
expect val s: String
<!EXPECT_ACTUAL_INCOMPATIBILITY{JVM}!>expect open class Foo3<!>
expect open class Foo3
// MODULE: m2-jvm()()(m1-common)
@@ -1,27 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// MODULE: m1-common
// FILE: common.kt
expect class Foo1
expect class Foo2
expect fun foo2(): Int
expect val s: String
expect open class Foo3
// MODULE: m2-jvm()()(m1-common)
// FILE: jvm.kt
interface Foo1
actual interface <!ACTUAL_WITHOUT_EXPECT!>Foo2<!>
actual var <!ACTUAL_WITHOUT_EXPECT!>s<!>: String = "value"
fun foo2(): Int = 0
actual class <!ACTUAL_WITHOUT_EXPECT, PACKAGE_OR_CLASSIFIER_REDECLARATION!>Foo3<!>
class <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>Foo3<!>
@@ -1,12 +1,12 @@
// MODULE: common
// TARGET_PLATFORM: Common
<!NO_ACTUAL_FOR_EXPECT{JVM}!>expect class CommonClass {
expect class CommonClass {
fun memberFun()
val memberProp: Int
class Nested
inner class Inner
}<!>
}
actual class <!ACTUAL_WITHOUT_EXPECT!>CommonClass<!> {
actual fun <!ACTUAL_WITHOUT_EXPECT!>memberFun<!>() {}
actual val <!ACTUAL_WITHOUT_EXPECT!>memberProp<!>: Int = 42
@@ -14,10 +14,10 @@ actual class <!ACTUAL_WITHOUT_EXPECT!>CommonClass<!> {
actual inner class <!ACTUAL_WITHOUT_EXPECT!>Inner<!>
}
<!NO_ACTUAL_FOR_EXPECT{JVM}!>expect fun commonFun()<!>
expect fun commonFun()
actual fun <!ACTUAL_WITHOUT_EXPECT!>commonFun<!>() {}
<!NO_ACTUAL_FOR_EXPECT{JVM}!>expect val commonProperty: String<!>
expect val commonProperty: String
actual val <!ACTUAL_WITHOUT_EXPECT!>commonProperty<!>: String
get() = "hello"
@@ -1,67 +0,0 @@
// MODULE: common
// TARGET_PLATFORM: Common
expect class CommonClass {
fun memberFun()
val memberProp: Int
class Nested
inner class Inner
}
actual class <!ACTUAL_WITHOUT_EXPECT!>CommonClass<!> {
actual fun <!ACTUAL_WITHOUT_EXPECT!>memberFun<!>() {}
actual val <!ACTUAL_WITHOUT_EXPECT!>memberProp<!>: Int = 42
actual class <!ACTUAL_WITHOUT_EXPECT!>Nested<!>
actual inner class <!ACTUAL_WITHOUT_EXPECT!>Inner<!>
}
expect fun commonFun()
actual fun <!ACTUAL_WITHOUT_EXPECT!>commonFun<!>() {}
expect val commonProperty: String
actual val <!ACTUAL_WITHOUT_EXPECT!>commonProperty<!>: String
get() = "hello"
// MODULE: intermediate()()(common)
// TARGET_PLATFORM: Common
expect class IntermediateClass {
fun memberFun()
val memberProp: Int
class Nested
inner class Inner
}
actual class <!ACTUAL_WITHOUT_EXPECT!>IntermediateClass<!> {
actual fun <!ACTUAL_WITHOUT_EXPECT!>memberFun<!>() {}
actual val <!ACTUAL_WITHOUT_EXPECT!>memberProp<!>: Int = 42
actual class <!ACTUAL_WITHOUT_EXPECT!>Nested<!>
actual inner class <!ACTUAL_WITHOUT_EXPECT!>Inner<!>
}
expect fun intermediateFun()
actual fun <!ACTUAL_WITHOUT_EXPECT!>intermediateFun<!>() {}
expect val intermediateProperty: String
actual val <!ACTUAL_WITHOUT_EXPECT!>intermediateProperty<!>: String
get() = "hello"
// MODULE: main()()(intermediate)
expect class PlatformClass {
fun memberFun()
val memberProp: Int
class Nested
inner class Inner
}
actual class <!ACTUAL_WITHOUT_EXPECT!>PlatformClass<!> {
actual fun <!ACTUAL_WITHOUT_EXPECT!>memberFun<!>() {}
actual val <!ACTUAL_WITHOUT_EXPECT!>memberProp<!>: Int = 42
actual class <!ACTUAL_WITHOUT_EXPECT!>Nested<!>
actual inner class <!ACTUAL_WITHOUT_EXPECT!>Inner<!>
}
expect fun platformFun()
actual fun <!ACTUAL_WITHOUT_EXPECT!>platformFun<!>() {}
expect val platformProperty: String
actual val <!ACTUAL_WITHOUT_EXPECT!>platformProperty<!>: String
get() = "hello"
@@ -4,7 +4,7 @@
expect fun parameterCount()
fun parameterCount(p: String) {}
<!NO_ACTUAL_FOR_EXPECT{JVM}!>expect fun parameterCount2()<!>
expect fun parameterCount2()
actual fun <!ACTUAL_WITHOUT_EXPECT!>parameterCount2<!>(p: String) {}
expect fun callableKind(): Int
@@ -13,9 +13,9 @@ val callableKind: Int = 1
expect fun <T> typeParameterCount()
fun typeParameterCount() {}
<!NO_ACTUAL_FOR_EXPECT{JVM}!>expect enum class EnumEntries {
expect enum class EnumEntries {
ONE, TWO;
}<!>
}
actual enum class <!ACTUAL_WITHOUT_EXPECT!>EnumEntries<!> {
ONE;
}
@@ -1,31 +0,0 @@
// MODULE: common
// TARGET_PLATFORM: Common
expect fun parameterCount()
fun parameterCount(p: String) {}
expect fun parameterCount2()
actual fun <!ACTUAL_WITHOUT_EXPECT!>parameterCount2<!>(p: String) {}
expect fun callableKind(): Int
val callableKind: Int = 1
expect fun <T> typeParameterCount()
fun typeParameterCount() {}
expect enum class EnumEntries {
ONE, TWO;
}
actual enum class <!ACTUAL_WITHOUT_EXPECT!>EnumEntries<!> {
ONE;
}
expect fun vararg(bar: Int)
fun vararg(vararg bar: Int) = Unit
// MODULE: main()()(common)
actual fun parameterCount() {}
actual fun <T> typeParameterCount() {}
actual fun callableKind(): Int = 1
actual fun vararg(bar: Int) = Unit