diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/actualInnerClassMissingMember.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/actualInnerClassMissingMember.ll.kt index 66d03881844..a6dc9644c48 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/actualInnerClassMissingMember.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/actualInnerClassMissingMember.ll.kt @@ -2,13 +2,13 @@ // FILE: common.kt annotation class Ann -expect class A { - class B { +expect class A { + class B { @Ann fun foo() - fun missingOnActual() - } -} + fun missingOnActual() + } +} // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt @@ -18,4 +18,4 @@ class AImpl { } } -actual typealias A = AImpl +actual typealias A = AImpl diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationArgRendering.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationArgRendering.ll.kt index 5cca8ea1bde..a9cd53ca787 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationArgRendering.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationArgRendering.ll.kt @@ -14,9 +14,9 @@ expect fun onType(): @Ann2("") Any? // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt -actual annotation class Ann +actual annotation class Ann -actual fun stringConcat() {} +actual fun stringConcat() {} // Not reported in K1, because supported starting from K2 -actual fun onType(): Any? = null +actual fun onType(): Any? = null diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationArgumentsConstExpressions.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationArgumentsConstExpressions.ll.kt index 49ce13342d6..4b9f7e7a1e4 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationArgumentsConstExpressions.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationArgumentsConstExpressions.ll.kt @@ -87,8 +87,8 @@ package test @ClassArgAnn(ClassForReference::class) actual fun getClassExpression() {} -@ClassArgAnn(ClassForReference::class) -actual fun differentClassesWithSameName() {} +@ClassArgAnn(ClassForReference::class) +actual fun differentClassesWithSameName() {} @StringArgAnn("1.9") actual fun stringConstant() {} @@ -114,8 +114,8 @@ actual fun varargInAnnotationWithArraySpread() {} @ArrayArgAnn(arrayOf("foo", "bar")) actual fun arrayInAnnotation() {} -@ArrayArgAnn(["foo"]) -actual fun arrayInAnnotationNotMatch() {} +@ArrayArgAnn(["foo"]) +actual fun arrayInAnnotationNotMatch() {} @NestedAnnArg( text = "root", @@ -127,7 +127,7 @@ actual fun arrayInAnnotationNotMatch() {} ) actual fun complexNestedAnnotations() {} -@NestedAnnArg( +@NestedAnnArg( text = "root", NestedAnnArg("1"), NestedAnnArg("2", @@ -135,4 +135,4 @@ actual fun complexNestedAnnotations() {} NestedAnnArg("DIFFERENT") ) ) -actual fun complexNestedAnnotationsNotMatch() {} +actual fun complexNestedAnnotationsNotMatch() {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationArgumentsDefaults.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationArgumentsDefaults.ll.kt index be1daa3a13e..c82eda5790b 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationArgumentsDefaults.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationArgumentsDefaults.ll.kt @@ -7,5 +7,5 @@ expect fun explicitDefaultArgument() // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt // No special handling for this case -@Ann -actual fun explicitDefaultArgument() {} +@Ann +actual fun explicitDefaultArgument() {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationTarget.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationTarget.ll.kt index 577a9ce58b7..a08feb7a069 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationTarget.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationTarget.ll.kt @@ -23,8 +23,8 @@ actual annotation class ExpectIsSubsetOfActual @Target(AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.CLASS) actual annotation class ExpectIsSubsetOfActualDifferentOrder -@Target(AnnotationTarget.FUNCTION) -actual annotation class MoreTargetsOnExpect +@Target(AnnotationTarget.FUNCTION) +actual annotation class MoreTargetsOnExpect @Target(AnnotationTarget.FUNCTION, AnnotationTarget.CLASS, AnnotationTarget.TYPEALIAS) actual annotation class RepeatedTargetsInExpect diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationTypeParameters.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationTypeParameters.ll.kt index a4f45fad3c5..af55812ade3 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationTypeParameters.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationTypeParameters.ll.kt @@ -62,26 +62,26 @@ expect fun explicitVsInfered() @Ann actual fun sameTypeParam() {} -@Ann -actual fun differentTypeParam() {} +@Ann +actual fun differentTypeParam() {} -@Ann -actual fun differentWithSameName() {} +@Ann +actual fun differentWithSameName() {} -@Ann -actual fun nonNullvsNull() {} +@Ann +actual fun nonNullvsNull() {} -@Ann> -actual fun differentVariance() {} +@Ann> +actual fun differentVariance() {} -@Ann> -actual fun varianceVsNoVariance() {} +@Ann> +actual fun varianceVsNoVariance() {} @Ann> actual fun sameVariance() {} -@Ann> -actual fun startProjection() {} +@Ann> +actual fun startProjection() {} @ComplexNested( ComplexNested(), @@ -89,11 +89,11 @@ actual fun startProjection() {} ) actual fun complexSame() {} -@ComplexNested( +@ComplexNested( ComplexNested(), ComplexNested(), ) -actual fun complexDiffer() {} +actual fun complexDiffer() {} @NestedWithSameTypeArgument( NestedWithSameTypeArgument() diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/basicOnDeclaration.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/basicOnDeclaration.ll.kt index 24b5ad2d430..2eded46b53a 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/basicOnDeclaration.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/basicOnDeclaration.ll.kt @@ -25,7 +25,7 @@ expect class AnnotationInside { @Ann actual class AnnotationMatching -actual class AnnotationOnExpectOnly +actual class AnnotationOnExpectOnly @Ann actual class AnnotationOnActualOnly @@ -34,7 +34,7 @@ actual class AnnotationInside { @Ann actual fun matches() {} - actual fun onlyOnExpect() {} + actual fun onlyOnExpect() {} @Ann actual fun onlyOnActual() {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/checkDiagnosticFullText.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/checkDiagnosticFullText.ll.kt index 8afbc683967..9f74c49b76c 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/checkDiagnosticFullText.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/checkDiagnosticFullText.ll.kt @@ -44,28 +44,28 @@ expect fun onType(param: @Ann Any) // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt -actual class OnClass +actual class OnClass actual class OnMember { - actual fun onMember() {} + actual fun onMember() {} } class ViaTypealiasImpl -actual typealias ViaTypealias = ViaTypealiasImpl +actual typealias ViaTypealias = ViaTypealiasImpl class MemberScopeViaTypealiasImpl { fun foo() {} } -actual typealias MemberScopeViaTypealias = MemberScopeViaTypealiasImpl +actual typealias MemberScopeViaTypealias = MemberScopeViaTypealiasImpl -@WithArg("other str") -actual fun withDifferentArg() {} +@WithArg("other str") +actual fun withDifferentArg() {} -actual fun inValueParam(arg: String) {} +actual fun inValueParam(arg: String) {} -actual fun inTypeParam() {} +actual fun inTypeParam() {} -actual val onGetter: String = "" +actual val onGetter: String = "" -actual fun onType(param: Any) {} +actual fun onType(param: Any) {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/classScopeInnerClasses.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/classScopeInnerClasses.ll.kt index 6ca419d53e3..43897973e91 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/classScopeInnerClasses.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/classScopeInnerClasses.ll.kt @@ -16,7 +16,7 @@ expect class A { actual class A { actual class B { actual class C { - actual fun foo() {} + actual fun foo() {} } } } diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/classScopeViaTypealiasIncompatible.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/classScopeViaTypealiasIncompatible.ll.kt index 0e2b21d8da9..c4d7ec8b6f4 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/classScopeViaTypealiasIncompatible.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/classScopeViaTypealiasIncompatible.ll.kt @@ -2,15 +2,15 @@ // FILE: common.kt annotation class Ann -expect class WeakIncompatibility { - @Ann - fun foo(p: String) -} +expect class WeakIncompatibility { + @Ann + fun foo(p: String) +} -expect class StrongIncompatibility { - @Ann - fun foo(p: Int) -} +expect class StrongIncompatibility { + @Ann + fun foo(p: Int) +} // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt @@ -19,7 +19,7 @@ class WeakIncompatibilityImpl { } // TODO: Duplicated diagnostic will be fixed in KT-62559 -actual typealias WeakIncompatibility = WeakIncompatibilityImpl +actual typealias WeakIncompatibility = WeakIncompatibilityImpl class StrongIncompatibilityImpl { fun foo(p: String) {} // Different param type diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/compatibleOverrides.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/compatibleOverrides.ll.kt index 4f2604e7185..4bbcd0e1af5 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/compatibleOverrides.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/compatibleOverrides.ll.kt @@ -14,5 +14,5 @@ expect class CompatibleOverrides { actual class CompatibleOverrides { actual fun foo() {} - actual fun foo(withArg: Any) {} + actual fun foo(withArg: Any) {} } diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/defaultValueParametersRendering.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/defaultValueParametersRendering.ll.kt index ec40c3c504b..99b6db9a192 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/defaultValueParametersRendering.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/defaultValueParametersRendering.ll.kt @@ -7,4 +7,4 @@ expect fun foo(p: Array = arrayOf()) // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt -actual fun = ...): Unit; fun foo(p: Array): Unit; Annotation `@Ann()` is missing on actual declaration")!>foo(p: Array) {} +actual fun = ...): Unit; fun foo(p: Array): Unit; Annotation `@Ann()` is missing on actual declaration")!>foo(p: Array) {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/differentOrder.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/differentOrder.ll.kt index f7c74f21805..06ee04e8cd6 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/differentOrder.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/differentOrder.ll.kt @@ -24,8 +24,8 @@ expect fun differentArgumentsOrder() @Ann1 actual class AnnotationOrder -@Ann3(2, 1) -actual class ValuesOrderInsideAnnotationArgument +@Ann3(2, 1) +actual class ValuesOrderInsideAnnotationArgument @Ann4(arg2 = "2", arg1 = "1") actual fun differentArgumentsOrder() {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/enumEntries.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/enumEntries.ll.kt index d7fb6c9d32e..a0a413b35c9 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/enumEntries.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/enumEntries.ll.kt @@ -2,14 +2,14 @@ // FILE: common.kt annotation class Ann -expect enum class E { +expect enum class E { @Ann FOO, - MISSING_ON_ACTUAL -} + MISSING_ON_ACTUAL +} // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt -actual enum class E { - FOO -} +actual enum class E { + FOO +} diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/fakeOverrides.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/fakeOverrides.ll.kt index e53379cda2d..7fa00c05328 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/fakeOverrides.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/fakeOverrides.ll.kt @@ -28,4 +28,4 @@ abstract class Intermediate : I { override fun noAnnotationOnActual() {} } -actual class FakeOverrideActual : Intermediate(), I +actual class FakeOverrideActual : Intermediate(), I diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/floatNumbersComparison.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/floatNumbersComparison.ll.kt index 6496873cb1d..26d4b70e4b9 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/floatNumbersComparison.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/floatNumbersComparison.ll.kt @@ -7,5 +7,5 @@ expect fun floatNumbersComparison() // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt -@Ann(0.1 + 0.1 + 0.1) -actual fun floatNumbersComparison() {} +@Ann(0.1 + 0.1 + 0.1) +actual fun floatNumbersComparison() {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/gettersAndSetters.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/gettersAndSetters.ll.kt index 7726ef94f3d..1e153232ebf 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/gettersAndSetters.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/gettersAndSetters.ll.kt @@ -23,20 +23,20 @@ expect var onSetter: String // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt -actual val onGetter: String - get() = "" +actual val onGetter: String + get() = "" -actual val onGetterImplicit: String = "" +actual val onGetterImplicit: String = "" -actual val onGetterWithExplicitTarget: String - get() = "" +actual val onGetterWithExplicitTarget: String + get() = "" actual val explicitTargetMatchesWithoutTarget: String @Ann get() = "" -@Ann -actual val setOnPropertyWithoutTargetNotMatch: String = "" +@Ann +actual val setOnPropertyWithoutTargetNotMatch: String = "" -actual var onSetter: String +actual var onSetter: String get() = "" - set(_) {} + set(_) {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/intrinsicConstEvaluation.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/intrinsicConstEvaluation.ll.kt index d32bcdf3ba5..41fd4f082c5 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/intrinsicConstEvaluation.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/intrinsicConstEvaluation.ll.kt @@ -18,5 +18,5 @@ expect fun nonMatching() @Ann(MyEnum.FOO.name) actual fun matching() {} -@Ann(MyEnum.FOO.name) -actual fun nonMatching() {} +@Ann(MyEnum.FOO.name) +actual fun nonMatching() {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/repeatableWithArg.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/repeatableWithArg.ll.kt index 5f385812990..9110ac2dcdb 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/repeatableWithArg.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/repeatableWithArg.ll.kt @@ -27,9 +27,9 @@ expect fun withSameArgLessOnActual() @AnnWithArg(s = "2") actual fun diffentOrder() {} -@AnnWithArg(s = "1") +@AnnWithArg(s = "1") @AnnWithArg(s = "3") -actual fun withDifferentArgLessOnActual() {} +actual fun withDifferentArgLessOnActual() {} @AnnWithArg(s = "1") @AnnWithArg(s = "2") diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/skippedAnnotations.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/skippedAnnotations.ll.kt index 4a6dd11f197..1a13546f973 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/skippedAnnotations.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/skippedAnnotations.ll.kt @@ -1,3 +1,6 @@ +// LL_FIR_DIVERGENCE +// UNRESOLVED_REFERENCE on MyOptIn is due to bug KT-61757 +// LL_FIR_DIVERGENCE // WITH_STDLIB // MODULE: m1-common // FILE: common.kt @@ -14,10 +17,10 @@ annotation class MyOptIn @Deprecated(message = "Some text") @DeprecatedSinceKotlin("1.8") @Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") -@MyOptIn -@WasExperimental(MyOptIn::class) +@MyOptIn +@WasExperimental(MyOptIn::class) @kotlin.internal.RequireKotlin(version = "1.8") -@OptIn(MyOptIn::class) +@OptIn(MyOptIn::class) expect fun skippedAnnotationsOnExpectOnly() @OptIn(ExperimentalMultiplatform::class) @@ -29,8 +32,8 @@ expect class ImplicitlyActualizedByJvmDeclarationOnExpectOnly package kotlin @OptIn(ExperimentalMultiplatform::class) -actual annotation class OptionalExpectationOnExpectOnly +actual annotation class OptionalExpectationOnExpectOnly -actual fun skippedAnnotationsOnExpectOnly() {} +actual fun skippedAnnotationsOnExpectOnly() {} -actual class ImplicitlyActualizedByJvmDeclarationOnExpectOnly +actual class ImplicitlyActualizedByJvmDeclarationOnExpectOnly diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/sourceRetentionAnnotationsWhenTypealias.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/sourceRetentionAnnotationsWhenTypealias.ll.kt index d55ccc08beb..013a0bd339d 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/sourceRetentionAnnotationsWhenTypealias.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/sourceRetentionAnnotationsWhenTypealias.ll.kt @@ -1,3 +1,6 @@ +// LL_FIR_DIVERGENCE +// Bug KT-62886 +// LL_FIR_DIVERGENCE // WITH_STDLIB // DIAGNOSTICS: -ACTUAL_TYPEALIAS_TO_SPECIAL_ANNOTATION // MODULE: m1-common @@ -20,6 +23,6 @@ class SourceAvailableImpl { fun foo() {} } -actual typealias SourceAvailable = SourceAvailableImpl +actual typealias SourceAvailable = SourceAvailableImpl -actual typealias FromLib = kotlin.SinceKotlin +actual typealias FromLib = kotlin.SinceKotlin diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/substitutionOverrideInTwoClasses.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/substitutionOverrideInTwoClasses.ll.kt index 9dce5ad1acd..62eb9ba13fb 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/substitutionOverrideInTwoClasses.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/substitutionOverrideInTwoClasses.ll.kt @@ -19,6 +19,6 @@ abstract class Parent { abstract class Intermediate : Parent() -actual class WithAnn : Intermediate() +actual class WithAnn : Intermediate() actual class WithoutAnn : Intermediate() diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/twoActualTypealiasesToSameClass.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/twoActualTypealiasesToSameClass.ll.kt index fd9c26265db..e3b99423d5d 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/twoActualTypealiasesToSameClass.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/twoActualTypealiasesToSameClass.ll.kt @@ -17,5 +17,5 @@ class Impl { fun foo() {} } -actual typealias WithAnn = Impl +actual typealias WithAnn = Impl actual typealias WithoutAnn = Impl diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeParameters.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeParameters.ll.kt index 19ca74cabb2..f445c592125 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeParameters.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeParameters.ll.kt @@ -13,15 +13,15 @@ expect class ViaTypealias<@Ann A> expect class TypealiasParamNotAccepted<@Ann A> -expect fun <@Ann A, @Ann B> withIncompatibility() +expect fun <@Ann A, @Ann B> withIncompatibility() // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt -actual fun inMethod() {} +actual fun inMethod() {} -actual fun <@Ann A, B> inMethodTwoParams() {} +actual fun <@Ann A, B> inMethodTwoParams() {} -actual class InClass +actual class InClass class ViaTypealiasImpl<@Ann A> @@ -29,6 +29,6 @@ actual typealias ViaTypealias = ViaTypealiasImpl class TypealiasParamNotAcceptedImpl -actual typealias TypealiasParamNotAccepted<@Ann A> = TypealiasParamNotAcceptedImpl +actual typealias TypealiasParamNotAccepted<@Ann A> = TypealiasParamNotAcceptedImpl actual fun withIncompatibility() {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeUsage.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeUsage.ll.kt index a0c748ce2ca..6ca61a2b28f 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeUsage.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeUsage.ll.kt @@ -19,9 +19,9 @@ interface I2 expect fun severalBounds() where T : I1, T : @Ann I2 -expect fun severalBoundsDifferentOrder() where T : I2, T : @Ann I1 +expect fun severalBoundsDifferentOrder() where T : I2, T : @Ann I1 -expect fun lessTypeParamBoundsOnActual() where T : I1, T : @Ann I2 +expect fun lessTypeParamBoundsOnActual() where T : I1, T : @Ann I2 expect fun @Ann Any.onReceiver() @@ -51,7 +51,7 @@ expect fun qualifierPartsMatching(arg: WithNested.Nested<@Ann String>) expect fun qualifierPartsNonMatching(arg: WithNested.Nested<@Ann String>) -expect fun funTypeVsUserType(arg: () -> @Ann String) +expect fun funTypeVsUserType(arg: () -> @Ann String) expect fun funcTypeReturnType(arg: () -> @Ann Any) @@ -61,46 +61,46 @@ expect fun funcTypeArgType(arg: (arg: @Ann Any) -> Unit) // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt -actual fun valueParameterType(arg: String) {} +actual fun valueParameterType(arg: String) {} -actual fun returnType(): String = "" +actual fun returnType(): String = "" -actual fun methodTypeParamBound() {} +actual fun methodTypeParamBound() {} -actual class OnClassTypeParamBound +actual class OnClassTypeParamBound -actual fun typeParamBoundInWhere() where T : Any {} +actual fun typeParamBoundInWhere() where T : Any {} -actual fun severalBounds() where T : I1, T : I2 {} +actual fun severalBounds() where T : I1, T : I2 {} actual fun severalBoundsDifferentOrder() where T : @Ann I1, T : I2 {} actual fun lessTypeParamBoundsOnActual() where T : @Ann I2 {} -actual fun Any.onReceiver() {} +actual fun Any.onReceiver() {} -actual class OnClassSuper : I1 +actual class OnClassSuper : I1 actual class OnClassSuperDifferentOrder : @Ann I2, I1 -actual class OnClassSuperMoreOnActual : I1, I2 +actual class OnClassSuperMoreOnActual : I1, I2 -actual class OnClassSuperTypeParams : I3 +actual class OnClassSuperTypeParams : I3 -actual fun deepInParamsTypes(arg: I3>) {} +actual fun deepInParamsTypes(arg: I3>) {} -actual fun starProjection(arg: I4<*, Any>) {} +actual fun starProjection(arg: I4<*, Any>) {} -actual fun typeArgWithVariance(t: I3) {} +actual fun typeArgWithVariance(t: I3) {} actual fun qualifierPartsMatching(arg: WithNested.Nested<@Ann String>) {} -actual fun qualifierPartsNonMatching(arg: WithNested<@Ann String>.Nested) {} +actual fun qualifierPartsNonMatching(arg: WithNested<@Ann String>.Nested) {} actual fun funTypeVsUserType(arg: kotlin.jvm.functions.Function0) {} -actual fun funcTypeReturnType(arg: () -> Any) {} +actual fun funcTypeReturnType(arg: () -> Any) {} -actual fun funcTypeReceiverType(arg: Any.() -> Unit) {} +actual fun funcTypeReceiverType(arg: Any.() -> Unit) {} -actual fun funcTypeArgType(arg: (arg: Any) -> Unit) {} +actual fun funcTypeArgType(arg: (arg: Any) -> Unit) {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeUsageTypealiasInSuper.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeUsageTypealiasInSuper.ll.kt index 283e777561c..dac347f19f7 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeUsageTypealiasInSuper.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeUsageTypealiasInSuper.ll.kt @@ -11,4 +11,4 @@ expect class Foo: @Ann I // FILE: jvm.kt typealias ITypealias = I -actual class Foo : ITypealias +actual class Foo : ITypealias diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeUsageWithImplicitType.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeUsageWithImplicitType.ll.kt index d244739065e..d33c2923090 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeUsageWithImplicitType.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeUsageWithImplicitType.ll.kt @@ -7,4 +7,4 @@ expect fun foo(): @Ann Int // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt -actual fun foo() = 1 +actual fun foo() = 1 diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeUsageWithUnresolvedReference.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeUsageWithUnresolvedReference.ll.kt index 323478de54e..335a26d92e2 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeUsageWithUnresolvedReference.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typeUsageWithUnresolvedReference.ll.kt @@ -3,7 +3,7 @@ @Target(AnnotationTarget.TYPE) annotation class Ann -expect fun foo() +expect fun foo() // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealias.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealias.ll.kt index 0ed804dfefe..e9d736135a8 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealias.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealias.ll.kt @@ -48,35 +48,35 @@ expect class InnerClassInsideTypealias { // FILE: jvm.kt class KtTypealiasNotMatchImpl -actual typealias KtTypealiasNotMatch = KtTypealiasNotMatchImpl +actual typealias KtTypealiasNotMatch = KtTypealiasNotMatchImpl class AnnotationsNotConsideredOnTypealiasImpl -@Ann -actual typealias AnnotationsNotConsideredOnTypealias = AnnotationsNotConsideredOnTypealiasImpl +@Ann +actual typealias AnnotationsNotConsideredOnTypealias = AnnotationsNotConsideredOnTypealiasImpl class MethodsInsideTypealiasImpl { fun foo() {} } -actual typealias MethodsInsideTypealias = MethodsInsideTypealiasImpl +actual typealias MethodsInsideTypealias = MethodsInsideTypealiasImpl class ValueInsideTypealiasImpl { val value: String = "" } -actual typealias ValueInsideTypealias = ValueInsideTypealiasImpl +actual typealias ValueInsideTypealias = ValueInsideTypealiasImpl class ConstructorInsideTypealiasImpl -actual typealias ConstructorInsideTypealias = ConstructorInsideTypealiasImpl +actual typealias ConstructorInsideTypealias = ConstructorInsideTypealiasImpl class MethodWithComplexAnnInsideTypealiasImpl { @ComplexAnn("13") fun withComplexAnn() {} } -actual typealias MethodWithComplexAnnInsideTypealias = MethodWithComplexAnnInsideTypealiasImpl +actual typealias MethodWithComplexAnnInsideTypealias = MethodWithComplexAnnInsideTypealiasImpl class InnerClassInsideTypealiasImpl { class Foo { @@ -84,4 +84,4 @@ class InnerClassInsideTypealiasImpl { } } -actual typealias InnerClassInsideTypealias = InnerClassInsideTypealiasImpl +actual typealias InnerClassInsideTypealias = InnerClassInsideTypealiasImpl diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaLibrary.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaLibrary.ll.kt index 5a4948d1a74..7b383c136e2 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaLibrary.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToJavaLibrary.ll.kt @@ -9,6 +9,6 @@ expect annotation class MyDeprecatedMatch // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt -actual typealias MyDeprecatedNotMatch = java.lang.Deprecated +actual typealias MyDeprecatedNotMatch = java.lang.Deprecated actual typealias MyDeprecatedMatch = java.lang.Deprecated diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToKtLibrary.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToKtLibrary.ll.kt index 2a47de49a2d..82fd16baf80 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToKtLibrary.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/typealiasToKtLibrary.ll.kt @@ -36,8 +36,8 @@ expect abstract class MyAbstractIterator { // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt -actual typealias MyDeprecatedNotMatch = kotlin.Deprecated +actual typealias MyDeprecatedNotMatch = kotlin.Deprecated actual typealias MyDeprecatedMatch = kotlin.Deprecated -actual typealias MyAbstractIterator = AbstractIterator +actual typealias MyAbstractIterator = AbstractIterator diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/valueParameters.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/valueParameters.ll.kt index d7c5cc481eb..5c6991541fa 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/valueParameters.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/valueParameters.ll.kt @@ -7,12 +7,12 @@ expect fun inMethod(@Ann arg: String) expect class InConstructor(@Ann arg: String) -expect fun withIncopatibility(@Ann p1: String, @Ann p2: String) +expect fun withIncopatibility(@Ann p1: String, @Ann p2: String) // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt -actual fun inMethod(arg: String) {} +actual fun inMethod(arg: String) {} -actual class InConstructor actual constructor(arg: String) {} +actual class InConstructor actual constructor(arg: String) {} actual fun withIncopatibility(p1: String) {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/withOtherIncomatibilities.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/withOtherIncomatibilities.ll.kt index 8848a429978..6d64dbae779 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/withOtherIncomatibilities.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/withOtherIncomatibilities.ll.kt @@ -2,17 +2,17 @@ // FILE: common.kt annotation class Ann -@Ann -expect inline fun hasWeakIncompatibility() +@Ann +expect inline fun hasWeakIncompatibility() -@Ann -expect fun hasStrongIncompatibility(arg: Int) +@Ann +expect fun hasStrongIncompatibility(arg: Int) expect fun hasStrongIncompatibility(arg: Double) // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt -actual fun hasWeakIncompatibility() {} +actual fun hasWeakIncompatibility() {} actual fun hasStrongIncompatibility(arg: Any?) {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeFunctionTypeParameterNamesInOverride.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeFunctionTypeParameterNamesInOverride.ll.kt index 9f01c201355..d8a7c2b9c8b 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeFunctionTypeParameterNamesInOverride.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeFunctionTypeParameterNamesInOverride.ll.kt @@ -5,7 +5,7 @@ open class Base { open fun foo(t: T) {} } -expect open class Foo : Base +expect open class Foo : Base // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeLateinitInOverride.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeLateinitInOverride.ll.kt index 7453bd4f69e..f954695bfba 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeLateinitInOverride.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeLateinitInOverride.ll.kt @@ -7,8 +7,8 @@ open class Base { open lateinit var green: String } -expect open class Foo : Base { -} +expect open class Foo : Base { +} // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromAbstractToFinalInOverride.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromAbstractToFinalInOverride.ll.kt index 1224bfa64d6..fecad3d145e 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromAbstractToFinalInOverride.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromAbstractToFinalInOverride.ll.kt @@ -5,7 +5,7 @@ interface Base { fun foo() } -expect open class Foo : Base +expect open class Foo : Base // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromAbstractToOpenInOverride.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromAbstractToOpenInOverride.ll.kt index 378a3e3a5b2..dca99f75dfc 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromAbstractToOpenInOverride.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromAbstractToOpenInOverride.ll.kt @@ -3,7 +3,7 @@ interface Base { fun foo() } -expect open class Foo() : Base +expect open class Foo() : Base // MODULE: m2-jvm()()(m1-common) diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromOpenToAbstractInOverride.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromOpenToAbstractInOverride.ll.kt index 59275dc00c5..7288c9e75d1 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromOpenToAbstractInOverride.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromOpenToAbstractInOverride.ll.kt @@ -3,7 +3,7 @@ interface Base { fun foo() {} } -expect abstract class Foo() : Base +expect abstract class Foo() : Base // MODULE: m2-jvm()()(m1-common) diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromOpenToFinalInOverride.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromOpenToFinalInOverride.ll.kt index 5fcc8f7e000..0f120ff95ee 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromOpenToFinalInOverride.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityFromOpenToFinalInOverride.ll.kt @@ -5,7 +5,7 @@ open class Base { open fun foo() {} } -expect open class Foo : Base +expect open class Foo : Base // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityOfSubstitutedFakeOverride.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityOfSubstitutedFakeOverride.ll.kt index afe583b5f93..97095ce2495 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityOfSubstitutedFakeOverride.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityOfSubstitutedFakeOverride.ll.kt @@ -5,7 +5,7 @@ open class Base { open fun foo(t: T) {} } -expect open class Foo : Base +expect open class Foo : Base // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityOfToStringInOverride.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityOfToStringInOverride.ll.kt index 64aacecc60f..a6db51f1d91 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityOfToStringInOverride.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeModalityOfToStringInOverride.ll.kt @@ -1,7 +1,7 @@ // MODULE: m1-common // FILE: common.kt -expect open class Foo +expect open class Foo // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeParameterNameInOverride.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeParameterNameInOverride.ll.kt index d0e00538386..285eec862fb 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeParameterNameInOverride.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeParameterNameInOverride.ll.kt @@ -5,7 +5,7 @@ open class Base { open fun foo(param: Int) {} } -expect open class Foo1 : Base +expect open class Foo1 : Base expect open class Foo2 : Base expect open class Foo3 { open fun foo(param: Int) diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeSetterVisibilityInOverride.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeSetterVisibilityInOverride.ll.kt index 964d3653e30..0456ae6b5f0 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeSetterVisibilityInOverride.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeSetterVisibilityInOverride.ll.kt @@ -6,7 +6,7 @@ open class Base { protected set } -expect open class Foo : Base +expect open class Foo : Base // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeVarargModifierInOverride.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeVarargModifierInOverride.ll.kt index 800468af7a7..b4da96e78a6 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeVarargModifierInOverride.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeVarargModifierInOverride.ll.kt @@ -5,8 +5,8 @@ open class Base { open fun foo(vararg bar: Int) {} } -expect open class Foo : Base { -} +expect open class Foo : Base { +} // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeVisibilityInOverride.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeVisibilityInOverride.ll.kt index eb4bdb07bff..42fb0aa213f 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeVisibilityInOverride.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeVisibilityInOverride.ll.kt @@ -5,7 +5,7 @@ open class Base { protected open fun foo() {} } -expect open class Foo : Base +expect open class Foo : Base // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantFunctionOverride.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantFunctionOverride.ll.kt index 1004c75aaf4..244520ea4f8 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantFunctionOverride.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantFunctionOverride.ll.kt @@ -6,8 +6,8 @@ open class Base { open fun foo(): Any = "" } -expect open class Foo : Base { -} +expect open class Foo : Base { +} // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantOverrideGenericUpperBound.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantOverrideGenericUpperBound.ll.kt index df9db6e8949..b0cf8421b07 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantOverrideGenericUpperBound.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantOverrideGenericUpperBound.ll.kt @@ -7,8 +7,8 @@ open class Base { open fun foo(): I = null!! } -expect open class Foo : Base { -} +expect open class Foo : Base { +} // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantOverrideGenerics.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantOverrideGenerics.ll.kt index 9259c7d1a6c..b2541f52358 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantOverrideGenerics.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantOverrideGenerics.ll.kt @@ -5,8 +5,8 @@ open class Base { open fun foo(): R = null!! } -expect open class Foo : Base { -} +expect open class Foo : Base { +} // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantPropertyOverride.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantPropertyOverride.ll.kt index 1c5a1354042..5f350ed7859 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantPropertyOverride.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantPropertyOverride.ll.kt @@ -6,7 +6,7 @@ open class Base { open fun foo(): String = "" } -expect open class Foo : Base +expect open class Foo : Base // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/flexibleTypesMatching.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/flexibleTypesMatching.ll.kt index 261b9aadbaf..2864d178ad6 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/flexibleTypesMatching.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/flexibleTypesMatching.ll.kt @@ -5,9 +5,9 @@ expect open class Base { open fun foo(): MutableList } -expect open class Foo : Base { +expect open class Foo : Base { -} +} // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/propertyKindOverride.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/propertyKindOverride.ll.kt index acab3021d6d..f49dbac0ac9 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/propertyKindOverride.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/propertyKindOverride.ll.kt @@ -5,7 +5,7 @@ open class Base { open val foo: Int = 1 } -expect open class Foo : Base +expect open class Foo : Base // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/severalMismatches.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/severalMismatches.ll.kt index 42f73030563..62f36af0da1 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/severalMismatches.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/severalMismatches.ll.kt @@ -8,10 +8,10 @@ open class Base() { protected open fun overrideVisibility(): Any = "" } -expect open class Foo : Base { +expect open class Foo : Base { fun existingMethod() val existingParam: Int -} +} // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/annotationArgArrayVsVararg.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/annotationArgArrayVsVararg.ll.kt index 45cfd950feb..f56d9436a06 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/annotationArgArrayVsVararg.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/annotationArgArrayVsVararg.ll.kt @@ -1,7 +1,7 @@ // MODULE: m1-common // FILE: common.kt -expect annotation class A(vararg val x: String) +expect annotation class A(vararg val x: String) @A("abc", "foo", "bar") fun test() {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/annotationArgTypeAliasWithArray.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/annotationArgTypeAliasWithArray.ll.kt index 497a656f41c..b590fbb8a88 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/annotationArgTypeAliasWithArray.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/annotationArgTypeAliasWithArray.ll.kt @@ -3,9 +3,9 @@ // MODULE: m1-common // FILE: common.kt -expect enum class Mode { +expect enum class Mode { Throughput, AverageTime -} +} expect annotation class BenchmarkMode(vararg val value: Mode) diff --git a/compiler/testData/diagnostics/tests/multiplatform/checkNoActualForExpectInLastModule.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/checkNoActualForExpectInLastModule.ll.kt index d0d72bc1d38..26ecc40c999 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/checkNoActualForExpectInLastModule.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/checkNoActualForExpectInLastModule.ll.kt @@ -1,4 +1,4 @@ // ISSUE: KT-58483 // MODULE: jvm // FILE: jvm.kt -expect class A +expect class A diff --git a/compiler/testData/diagnostics/tests/multiplatform/complexMatchings/expectCtorlessFinalToActualObject.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/complexMatchings/expectCtorlessFinalToActualObject.ll.kt index 445277cc495..2822c5796ec 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/complexMatchings/expectCtorlessFinalToActualObject.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/complexMatchings/expectCtorlessFinalToActualObject.ll.kt @@ -2,27 +2,27 @@ // FILE: common.kt expect class E01 -expect class E02() -expect open class E03 +expect class E02() +expect open class E03 -expect class E04 { +expect class E04 { constructor() -} +} -expect class E05(e: E01) -expect class E06 { +expect class E05(e: E01) +expect class E06 { constructor(e: E02) -} +} -expect interface I01 +expect interface I01 expect class M01 { fun foo() } -expect enum class ENUM01 +expect enum class ENUM01 -expect annotation class ANNO01 +expect annotation class ANNO01 // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/complexMatchings/expectCtorlessFinalToActualObjectViaTypealias.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/complexMatchings/expectCtorlessFinalToActualObjectViaTypealias.ll.kt index 7d234dd7a51..36fff53803a 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/complexMatchings/expectCtorlessFinalToActualObjectViaTypealias.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/complexMatchings/expectCtorlessFinalToActualObjectViaTypealias.ll.kt @@ -2,27 +2,27 @@ // FILE: common.kt expect class E01 -expect class E02() -expect open class E03 +expect class E02() +expect open class E03 -expect class E04 { +expect class E04 { constructor() -} +} -expect class E05(e: E01) -expect class E06 { +expect class E05(e: E01) +expect class E06 { constructor(e: E02) -} +} -expect interface I01 +expect interface I01 expect class M01 { fun foo() } -expect enum class ENUM01 +expect enum class ENUM01 -expect annotation class ANNO01 +expect annotation class ANNO01 // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.ll.kt index e06dfd57f0e..893462ee3af 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.ll.kt @@ -30,4 +30,4 @@ actual annotation class A3(actual val x: Int = 42, actual val y: String = "OK") actual annotation class A4(actual val x: Int, actual val y: String = "OK") -actual annotation class A5(actual val x: Int = 239, actual val y: String = "OK") +actual annotation class A5(actual val x: Int = 239, actual val y: String = "OK") diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.ll.kt index 564fefc15a3..4aadc9bd854 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.ll.kt @@ -25,7 +25,7 @@ actual typealias A1 = J1 actual typealias A2 = J2 actual typealias A3 = J3 actual typealias A4 = J4 -actual typealias A5 = J5 +actual typealias A5 = J5 // FILE: J1.java diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAliasExpectEnumArg.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAliasExpectEnumArg.ll.kt index 50a41ee878f..579d2d12e44 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAliasExpectEnumArg.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAliasExpectEnumArg.ll.kt @@ -12,7 +12,7 @@ expect annotation class NonMatching(val e: E = E.BAR) // FILE: jvm.kt actual typealias E = EJava actual typealias Matching = AJava -actual typealias NonMatching = AJava +actual typealias NonMatching = AJava // FILE: EJava.java public enum EJava { diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/methodDefaultArgsViaActualFakeOverride/delegation.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/methodDefaultArgsViaActualFakeOverride/delegation.ll.kt index b0bb1f98550..8d7c0b99932 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/methodDefaultArgsViaActualFakeOverride/delegation.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/methodDefaultArgsViaActualFakeOverride/delegation.ll.kt @@ -1,8 +1,8 @@ // MODULE: m1-common // FILE: common.kt -expect class Foo { - fun foo(param: Int = 1) -} +expect class Foo { + fun foo(param: Int = 1) +} // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/methodDefaultArgsViaActualFakeOverride/simpleIncompatible.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/methodDefaultArgsViaActualFakeOverride/simpleIncompatible.ll.kt index ee329c2bf1d..00043f5b547 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/methodDefaultArgsViaActualFakeOverride/simpleIncompatible.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/methodDefaultArgsViaActualFakeOverride/simpleIncompatible.ll.kt @@ -1,9 +1,9 @@ // MODULE: m1-common // FILE: common.kt -expect class Foo { +expect class Foo { fun foo(param: Int = 1) - fun missingOnActual() -} + fun missingOnActual() +} // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/methodDefaultArgsViaActualTypealias.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/methodDefaultArgsViaActualTypealias.ll.kt index ee7e7cb8f2d..5e46b410fcf 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/methodDefaultArgsViaActualTypealias.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/methodDefaultArgsViaActualTypealias.ll.kt @@ -17,9 +17,9 @@ expect class WithDefaultArgFromSuper : I { override fun methodWithDefaultArg(s: String) } -expect open class WithIncompatibility { +expect open class WithIncompatibility { fun foo(p: String = "common") -} +} // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/nestedAnnotationClassViaActualTypealias.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/nestedAnnotationClassViaActualTypealias.ll.kt index 8534be0c5bf..f6788ba54e0 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/nestedAnnotationClassViaActualTypealias.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/nestedAnnotationClassViaActualTypealias.ll.kt @@ -1,8 +1,8 @@ // MODULE: m1-common // FILE: common.kt -expect class DefaultArgsInNestedClass { - annotation class Nested(val p: String = "") -} +expect class DefaultArgsInNestedClass { + annotation class Nested(val p: String = "") +} // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/enum/constructorInHeaderEnum.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/enum/constructorInHeaderEnum.ll.kt index 6797b88127c..6b93372cb58 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/enum/constructorInHeaderEnum.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/enum/constructorInHeaderEnum.ll.kt @@ -1,14 +1,14 @@ // MODULE: m1-common // FILE: common.kt -expect enum class En(x: Int) { +expect enum class En(x: Int) { E1, E2(42), ; constructor(s: String) -} +} -expect enum class En2 { +expect enum class En2 { E1() -} +} diff --git a/compiler/testData/diagnostics/tests/multiplatform/enum/enumEntryWithBody.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/enum/enumEntryWithBody.ll.kt index 49277f563dd..9033bddee4a 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/enum/enumEntryWithBody.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/enum/enumEntryWithBody.ll.kt @@ -1,10 +1,10 @@ // MODULE: m1-common // FILE: common.kt -expect enum class En { +expect enum class En { E1, E2 { fun foo() = "" }, E3 { }; -} +} diff --git a/compiler/testData/diagnostics/tests/multiplatform/expectExternal.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/expectExternal.ll.kt index d94c059c7c6..3b1dfea9b7a 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/expectExternal.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/expectExternal.ll.kt @@ -1,19 +1,23 @@ +// LL_FIR_DIVERGENCE +// WRONG_MODIFIER_TARGET not reported in LL and reported in CLI tests in common module, +// because it is JVM-only checker, and in CLI common module analyzed additionally against JVM target. +// LL_FIR_DIVERGENCE // MODULE: m1-common // FILE: common.kt expect external fun foo() expect fun bar() -expect external var prop: String +expect external var prop: String expect var getAndSet: String external get external set -external expect val explicitGetter: String +external expect val explicitGetter: String external get -expect external class A { +expect external class A { external fun foo() fun bar() } diff --git a/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.ll.kt index ddbb5306b87..d77e3d8aeb8 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.ll.kt @@ -1,15 +1,15 @@ // MODULE: m1-common // FILE: common.kt // TODO: .fir.kt version is just a stub. -expect interface My { +expect interface My { open fun openFunPositive() - open fun openFunNegative() + open fun openFunNegative() abstract fun abstractFun() open val openValPositive: Int - open val openValNegative: Int + open val openValNegative: Int abstract val abstractVal: Int -} +} // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.ll.kt index 0fd78e30919..de2dfec1596 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.ll.kt @@ -4,7 +4,7 @@ interface A interface B -expect fun List.foo() where T : A, T : B +expect fun List.foo() where T : A, T : B // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.ll.kt index 6fcdfffd316..119fd39e8bf 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.ll.kt @@ -7,7 +7,7 @@ expect annotation class Foo3 expect annotation class Foo4 expect annotation class Foo5() expect annotation class Foo6() -expect annotation class Foo7() +expect annotation class Foo7() @Foo1 fun foo() {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.ll.kt index e7e31564b6a..649563e8234 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.ll.kt @@ -5,9 +5,9 @@ expect class Foo1 expect class Foo2 expect class Foo3 -expect class Bar1() -expect class Bar2() -expect class Bar3() +expect class Bar1() +expect class Bar2() +expect class Bar3() expect class Bar4() expect class Bar5() expect class Bar6() diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/equalsOverrideInActualInterface.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/equalsOverrideInActualInterface.ll.kt index 2a725f1ac29..edc9b346347 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/equalsOverrideInActualInterface.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/equalsOverrideInActualInterface.ll.kt @@ -1,5 +1,5 @@ // MODULE: m1-common -expect interface Base +expect interface Base // MODULE: m1-jvm()()(m1-common) actual interface Base { diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithExplicitAbstractMember.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithExplicitAbstractMember.ll.kt index 68cb5fee75f..15555f2e760 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithExplicitAbstractMember.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithExplicitAbstractMember.ll.kt @@ -5,18 +5,18 @@ interface Foo { fun foo() } -expect class NonAbstractClass : Foo { +expect class NonAbstractClass : Foo { abstract fun bar() abstract val baz: Int abstract override fun foo() -} +} -expect abstract class AbstractClass : Foo { +expect abstract class AbstractClass : Foo { abstract fun bar() abstract val baz: Int abstract override fun foo() -} +} diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.ll.kt index 33e4e77f005..eaa055461e5 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.ll.kt @@ -3,12 +3,12 @@ // FILE: common.kt expect fun foo1(x: Int) -expect fun foo2(x: Int) +expect fun foo2(x: Int) expect class NoArgConstructor() -expect fun foo3(): Int -expect fun foo4(): Int +expect fun foo3(): Int +expect fun foo4(): Int // MODULE: m2-jvm()()(m1-common) diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.ll.kt index 2064b039f68..c632c74dc2c 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.ll.kt @@ -2,14 +2,14 @@ // MODULE: m1-common // FILE: common.kt -expect class Foo1 -expect class Foo2 +expect class Foo1 +expect class Foo2 expect fun foo2(): Int -expect val s: String +expect val s: String -expect open class Foo3 +expect open class Foo3 // MODULE: m2-jvm()()(m1-common) diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFunInterface.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFunInterface.ll.kt index 1982e2dcdc2..a09535ed2d9 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFunInterface.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFunInterface.ll.kt @@ -5,9 +5,9 @@ expect fun interface F1 { fun run() } -expect fun interface F2 { +expect fun interface F2 { fun run() -} +} expect fun interface F3 { fun run() @@ -21,9 +21,9 @@ expect fun interface F5 { fun run() } -expect fun interface F6 { +expect fun interface F6 { fun run() -} +} expect fun interface F7 { fun run() diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/explicitConstructorDelegation.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/explicitConstructorDelegation.ll.kt index 3fe9c4e0f72..89b17a77f25 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/explicitConstructorDelegation.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/explicitConstructorDelegation.ll.kt @@ -1,13 +1,13 @@ // MODULE: m1-common // FILE: common.kt -expect open class A { +expect open class A { constructor(s: String) constructor(n: Number) : this("A") -} +} -expect class B : A { +expect class B : A { constructor(i: Int) constructor() : super("B") -} +} diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithAbstractMember.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithAbstractMember.ll.kt index 44b93bf4283..807affa7d9f 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithAbstractMember.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithAbstractMember.ll.kt @@ -1,10 +1,10 @@ // MODULE: m1-common // FILE: common.kt -expect abstract class BaseA() { +expect abstract class BaseA() { abstract fun foo() -} -expect open class BaseAImpl() : BaseA +} +expect open class BaseAImpl() : BaseA class DerivedA1 : BaseAImpl() class DerivedA2 : BaseAImpl() { @@ -13,10 +13,10 @@ class DerivedA2 : BaseAImpl() { -expect interface BaseB { +expect interface BaseB { fun foo() -} -expect open class BaseBImpl() : BaseB +} +expect open class BaseBImpl() : BaseB class DerivedB1 : BaseBImpl() class DerivedB2 : BaseBImpl() { @@ -25,10 +25,10 @@ class DerivedB2 : BaseBImpl() { -expect interface BaseC { +expect interface BaseC { fun foo() -} -expect abstract class BaseCImpl() : BaseC +} +expect abstract class BaseCImpl() : BaseC class DerivedC1 : BaseCImpl() class DerivedC2 : BaseCImpl() { @@ -37,35 +37,35 @@ class DerivedC2 : BaseCImpl() { -expect interface BaseD { +expect interface BaseD { fun foo() -} +} abstract class BaseDImpl() : BaseD { fun bar() = super.foo() } -expect interface BaseE { +expect interface BaseE { fun foo() -} +} sealed class BaseEImpl() : BaseE { fun bar() = super.foo() } -expect interface BaseF { +expect interface BaseF { fun foo() -} -expect class BaseFImpl() : BaseF +} +expect class BaseFImpl() : BaseF -expect abstract class BaseG() { +expect abstract class BaseG() { abstract fun foo() -} -expect open class BaseGImpl() : BaseG { +} +expect open class BaseGImpl() : BaseG { override fun foo() -} +} class DerivedG1 : BaseGImpl() diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.ll.kt index 0bb134ba6ea..804c086a1ae 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.ll.kt @@ -3,8 +3,8 @@ // FILE: common.kt expect class C1 -expect interface C2 -expect interface C3 +expect interface C2 +expect interface C3 expect interface C4 expect interface C5 expect interface C6 diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.fir.kt index 168dc2aebd8..3b343205a6b 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.fir.kt @@ -1,4 +1,3 @@ -// IGNORE_REVERSED_RESOLVE // MODULE: m1-common // FILE: common.kt expect class Foo { diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.kt index 6d9a411b4d4..18062e939ab 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.kt @@ -1,4 +1,3 @@ -// IGNORE_REVERSED_RESOLVE // MODULE: m1-common // FILE: common.kt expect class Foo { diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.ll.kt index 168dc2aebd8..18062e939ab 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.ll.kt @@ -1,7 +1,6 @@ -// IGNORE_REVERSED_RESOLVE // MODULE: m1-common // FILE: common.kt -expect class Foo { +expect class Foo { init { "no" } @@ -21,4 +20,4 @@ fun functionWithBody(x: Int): Int { return x + 1 } -} +} diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/inheritanceByDelegationInExpectClass.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/inheritanceByDelegationInExpectClass.ll.kt index 87070ad9553..864bba60d90 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/inheritanceByDelegationInExpectClass.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/inheritanceByDelegationInExpectClass.ll.kt @@ -4,6 +4,6 @@ interface A class B : A -expect class Foo(b: B) : A by b +expect class Foo(b: B) : A by b -expect class Bar : A by B() +expect class Bar : A by B() diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/memberPropertyKinds.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/memberPropertyKinds.ll.kt index e091de9a449..b7054569fd7 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/memberPropertyKinds.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/memberPropertyKinds.ll.kt @@ -1,7 +1,7 @@ // MODULE: m1-common // FILE: common.kt -expect class Foo { +expect class Foo { val justVal: String var justVar: String @@ -25,6 +25,6 @@ lateinit var lateinitVar: String val delegated: String by Delegate -} +} object Delegate { operator fun getValue(x: Any?, y: Any?): String = "" } diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.ll.kt index a8576266986..61293e6a934 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.ll.kt @@ -2,20 +2,20 @@ // MODULE: m1-common // FILE: common.kt -expect open class Container { +expect open class Container { fun publicFun() internal fun internalFun1() internal fun internalFun2() - internal fun internalFun3() + internal fun internalFun3() protected fun protectedFun1() protected fun protectedFun2() - protected fun protectedFun3() + protected fun protectedFun3() - open internal fun openInternalFun() - open fun openPublicFun() -} + open internal fun openInternalFun() + open fun openPublicFun() +} // MODULE: m2-jvm()()(m1-common) diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActualViaTypeAlias_openMember.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActualViaTypeAlias_openMember.ll.kt index eb3e248b151..b1c8678b4df 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActualViaTypeAlias_openMember.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActualViaTypeAlias_openMember.ll.kt @@ -2,9 +2,9 @@ // MODULE: m1-common // FILE: common.kt -expect open class Container { - internal open fun internalFun() -} +expect open class Container { + internal open fun internalFun() +} // MODULE: m2-jvm()()(m1-common) diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.ll.kt index 5990a0538bf..73044e2c9cd 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.ll.kt @@ -14,9 +14,9 @@ expect class C { expect inner class I } -expect class D { - class N -} +expect class D { + class N +} expect class E { class N diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.ll.kt index 538fbf91710..bd34df5eb05 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.ll.kt @@ -1,10 +1,10 @@ // MODULE: m1-common // FILE: common.kt -expect class Foo { +expect class Foo { fun bar(): String - fun bas(f: Int) -} + fun bas(f: Int) +} // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/smartCastOnExpectClass.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/smartCastOnExpectClass.ll.kt index 7661dd8c085..b7d87bf7e16 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/smartCastOnExpectClass.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/smartCastOnExpectClass.ll.kt @@ -1,9 +1,9 @@ // MODULE: m1-common // FILE: common.kt -expect class Foo { // also, it's important that Foo doesn't override equals +expect class Foo { // also, it's important that Foo doesn't override equals fun foo() -} +} fun check(x1: Foo, x: Any) { if (x1 == x) { diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.ll.kt index 0e66fb047af..124c447839f 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.ll.kt @@ -7,9 +7,9 @@ interface J expect class Foo : I, C, J -expect class Bar : C() +expect class Bar : C() -expect class WithExplicitPrimaryConstructor() : C() +expect class WithExplicitPrimaryConstructor() : C() // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediateActualHasAdditionalSupertypes.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediateActualHasAdditionalSupertypes.ll.kt index 00a23bfaed3..18d606b92d9 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediateActualHasAdditionalSupertypes.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/intermediateActualHasAdditionalSupertypes.ll.kt @@ -1,3 +1,6 @@ +// LL_FIR_DIVERGENCE +// False positive reports of ARGUMENT_TYPE_MISMATCH and UNRESOLVED_REFERENCE are due to bug KT-63382. +// LL_FIR_DIVERGENCE // ISSUE: KT-57369 // MODULE: common @@ -25,6 +28,6 @@ fun cancelFutureOnCompletionAlt(handlerBase: CompletionHandlerBase) { // MODULE: main()()(common, intermediate) // the order of dependencies is important to reproduce KT-57369 fun cancelFutureOnCompletion(handlerBase: CompletionHandlerBase) { - invokeOnCompletion(handlerBase) - handlerBase.foo() + invokeOnCompletion(handlerBase) + handlerBase.foo() } diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/kt57320.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/kt57320.ll.kt index 71c9a8060e1..71a2db2389e 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/kt57320.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/kt57320.ll.kt @@ -4,9 +4,9 @@ // TARGET_PLATFORM: Common // FILE: StringValue.kt -expect class StringValue +expect class StringValue -expect fun StringValue.plus(other: String): StringValue +expect fun StringValue.plus(other: String): StringValue // MODULE: commonJS()()(common) // TARGET_PLATFORM: JS @@ -26,7 +26,7 @@ interface KotlinXStringDemoInterface { val value: String } -expect fun StringDemoInterface.plusK(): String +expect fun StringDemoInterface.plusK(): String // MODULE: js()()(common, intermediate) // TARGET_PLATFORM: JS diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/sourceRetentionAnnotationsWhenTypealias.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/sourceRetentionAnnotationsWhenTypealias.ll.kt index 8e1fa87e5f3..e0299e59ab8 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/sourceRetentionAnnotationsWhenTypealias.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/sourceRetentionAnnotationsWhenTypealias.ll.kt @@ -1,3 +1,6 @@ +// LL_FIR_DIVERGENCE +// Bug KT-62886 +// LL_FIR_DIVERGENCE // FIR_IDENTICAL // WITH_STDLIB // MODULE: common @@ -12,4 +15,4 @@ expect annotation class CommonVolatile @Retention(AnnotationRetention.SOURCE) actual annotation class Ann -actual typealias CommonVolatile = kotlin.jvm.Volatile +actual typealias CommonVolatile = kotlin.jvm.Volatile diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/typealiasToJavaWithAnnotationArgument.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/typealiasToJavaWithAnnotationArgument.ll.kt index 22ab5dd7bc4..f4ed8d806be 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/typealiasToJavaWithAnnotationArgument.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/annotationMatching/typealiasToJavaWithAnnotationArgument.ll.kt @@ -11,7 +11,7 @@ expect class Foo // FILE: Foo.kt actual annotation class Ann actual constructor(actual val p: Int) -actual typealias Foo = FooImpl +actual typealias Foo = FooImpl // FILE: FooImpl.java @Ann(p = 2) diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.fir.kt index 4e8982eb471..2dbec71f725 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.fir.kt @@ -1,4 +1,3 @@ -// IGNORE_REVERSED_RESOLVE // MODULE: common // TARGET_PLATFORM: Common diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.kt index a7f9a14599e..470a2c7a0e2 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.kt @@ -1,4 +1,3 @@ -// IGNORE_REVERSED_RESOLVE // MODULE: common // TARGET_PLATFORM: Common diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.ll.kt index 4e8982eb471..73d27736950 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.ll.kt @@ -1,13 +1,12 @@ -// IGNORE_REVERSED_RESOLVE // MODULE: common // TARGET_PLATFORM: Common -expect class CommonClass { +expect class CommonClass { fun memberFun() val memberProp: Int class Nested inner class Inner -} +} actual class CommonClass { actual fun memberFun() {} actual val memberProp: Int = 42 @@ -15,10 +14,10 @@ actual class CommonClass { actual inner class Inner } -expect fun commonFun() +expect fun commonFun() actual fun commonFun() {} -expect val commonProperty: String +expect val commonProperty: String actual val commonProperty: String get() = "hello" diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.ll.kt index 12387fd63d8..1800c77f35f 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.ll.kt @@ -4,7 +4,7 @@ expect fun parameterCount() fun parameterCount(p: String) {} -expect fun parameterCount2() +expect fun parameterCount2() actual fun parameterCount2(p: String) {} expect fun callableKind(): Int @@ -13,9 +13,9 @@ val callableKind: Int = 1 expect fun typeParameterCount() fun typeParameterCount() {} -expect enum class EnumEntries { +expect enum class EnumEntries { ONE, TWO; -} +} actual enum class EnumEntries { ONE; } diff --git a/compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_AbstractMap.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_AbstractMap.ll.kt index 7c1b21fe30a..b2c3ad70bd9 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_AbstractMap.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_AbstractMap.ll.kt @@ -3,9 +3,9 @@ // FILE: common.kt // K2: false positve INCOMPATIBLE_MATCHING: KT-60155 -public expect abstract class AbstractMutableMap : MutableMap { +public expect abstract class AbstractMutableMap : MutableMap { override val values: MutableCollection -} +} // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/incompatibles.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/incompatibles.ll.kt index 64ab9d14d68..6d6e08c907a 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/incompatibles.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/incompatibles.ll.kt @@ -1,12 +1,12 @@ -header impl class First +header impl class First -header expect class Second +header expect class Second -header actual class Third +header actual class Third -impl expect class Fourth +impl expect class Fourth impl actual class Fifth -expect actual class Sixth +expect actual class Sixth diff --git a/compiler/testData/diagnostics/tests/multiplatform/java/implicitJavaActualizationAllowed.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/java/implicitJavaActualizationAllowed.ll.kt index 73ce26bdcb6..8581f8bf983 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/java/implicitJavaActualizationAllowed.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/java/implicitJavaActualizationAllowed.ll.kt @@ -5,11 +5,11 @@ import kotlin.jvm.ImplicitlyActualizedByJvmDeclaration -@OptIn(ExperimentalMultiplatform::class) +@OptIn(ExperimentalMultiplatform::class) @ImplicitlyActualizedByJvmDeclaration -expect class Foo() { +expect class Foo() { fun foo() -} +} // MODULE: m2-jvm()()(m1-common) // FILE: Foo.java diff --git a/compiler/testData/diagnostics/tests/multiplatform/java/implicitJavaActualizationDisallowed.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/java/implicitJavaActualizationDisallowed.ll.kt index e2f36560827..1ad69d3915f 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/java/implicitJavaActualizationDisallowed.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/java/implicitJavaActualizationDisallowed.ll.kt @@ -1,9 +1,9 @@ // MODULE: m1-common // FILE: common.kt -expect class Foo() { +expect class Foo() { fun foo() -} +} // MODULE: m2-jvm()()(m1-common) // FILE: Foo.java diff --git a/compiler/testData/diagnostics/tests/multiplatform/java/implicitJavaActualization_multipleActuals.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/java/implicitJavaActualization_multipleActuals.ll.kt index ac55ed4f888..6e1bfbcf4fb 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/java/implicitJavaActualization_multipleActuals.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/java/implicitJavaActualization_multipleActuals.ll.kt @@ -1,9 +1,9 @@ // MODULE: m1-common // FILE: common.kt -expect class Foo(i: Int) { +expect class Foo(i: Int) { fun foo() -} +} // MODULE: m2-jvm()()(m1-common) // FILE: Foo.java diff --git a/compiler/testData/diagnostics/tests/multiplatform/java/implicitJavaActualization_oldLanguageVersion.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/java/implicitJavaActualization_oldLanguageVersion.ll.kt index 9020feb897e..09939b21e72 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/java/implicitJavaActualization_oldLanguageVersion.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/java/implicitJavaActualization_oldLanguageVersion.ll.kt @@ -2,9 +2,9 @@ // MODULE: m1-common // FILE: common.kt -expect class Foo() { +expect class Foo() { fun foo() -} +} // MODULE: m2-jvm()()(m1-common) // FILE: Foo.java diff --git a/compiler/testData/diagnostics/tests/multiplatform/kt54827.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/kt54827.ll.kt index a641c0f4208..1070dd6d9bd 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/kt54827.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/kt54827.ll.kt @@ -1,8 +1,8 @@ // MODULE: m1-common // FILE: common.kt -expect class SomeClass { +expect class SomeClass { fun foo() -} +} // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.fir.kt index a36d2ce82cc..3ba367c18db 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.fir.kt @@ -1,4 +1,3 @@ -// IGNORE_REVERSED_RESOLVE // MODULE: m1-common // FILE: common.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.kt b/compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.kt index 57a3de167b7..2bb567aa109 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.kt @@ -1,4 +1,3 @@ -// IGNORE_REVERSED_RESOLVE // MODULE: m1-common // FILE: common.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/optionalExpectationDiagnostics.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/optionalExpectationDiagnostics.ll.kt index 51f19600c50..aae466d20b5 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/optionalExpectationDiagnostics.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/optionalExpectationDiagnostics.ll.kt @@ -10,8 +10,8 @@ expect annotation class A() fun useInSignature(a: A) = a.toString() -@OptionalExpectation -expect class NotAnAnnotationClass +@OptionalExpectation +expect class NotAnAnnotationClass @OptionalExpectation annotation class NotAnExpectedClass diff --git a/compiler/testData/diagnostics/tests/multiplatform/returnTypeVsGenericsUpperBoundIncompatibility.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/returnTypeVsGenericsUpperBoundIncompatibility.ll.kt index a9e38c6b9e6..d5b21998b18 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/returnTypeVsGenericsUpperBoundIncompatibility.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/returnTypeVsGenericsUpperBoundIncompatibility.ll.kt @@ -2,7 +2,7 @@ // FILE: common.kt interface A -expect fun foo(t: T): String +expect fun foo(t: T): String // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingHeaderDeclarations.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingHeaderDeclarations.ll.kt index f87e53ebf27..174d90a0ae6 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingHeaderDeclarations.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingHeaderDeclarations.ll.kt @@ -1,7 +1,7 @@ // MODULE: m1-common // FILE: common.kt -expect fun foo() -expect fun foo() +expect fun foo() +expect fun foo() -expect fun foo(x: Int) +expect fun foo(x: Int) diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.ll.kt index 328ff3551dd..5a9e7651264 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.ll.kt @@ -2,7 +2,7 @@ // FILE: common.kt package common -expect fun foo() +expect fun foo() // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerDeclarationWithBody.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerDeclarationWithBody.ll.kt index 583c8257ae5..1321694d200 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerDeclarationWithBody.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerDeclarationWithBody.ll.kt @@ -1,8 +1,8 @@ // MODULE: m1-common // FILE: common.kt -expect fun foo() +expect fun foo() -expect fun foo() {} +expect fun foo() {} -expect fun bar() {} +expect fun bar() {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerWithoutImpl.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerWithoutImpl.ll.kt index 243664b3dee..a3848aebdfa 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerWithoutImpl.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerWithoutImpl.ll.kt @@ -1,4 +1,4 @@ // MODULE: m1-common // FILE: common.kt -expect fun foo() +expect fun foo() diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.ll.kt index ac6c3467554..0f13db6957e 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.ll.kt @@ -1,7 +1,7 @@ // MODULE: m1-common // FILE: common.kt -inline expect fun inlineFun() +inline expect fun inlineFun() expect fun nonInlineFun() // MODULE: m2-jvm()()(m1-common) diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.ll.kt index 19583505d75..c0f5a7fa4e6 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.ll.kt @@ -3,15 +3,15 @@ // FILE: common.kt expect fun f1(s: () -> String) -expect inline fun f2(s: () -> String) +expect inline fun f2(s: () -> String) expect inline fun f3(noinline s: () -> String) expect fun f4(s: () -> String) -expect inline fun f5(s: () -> String) +expect inline fun f5(s: () -> String) expect inline fun f6(crossinline s: () -> String) -expect fun f7(x: Any) -expect fun f8(vararg x: Any) +expect fun f7(x: Any) +expect fun f8(vararg x: Any) // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/differentKindsOfProperties.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/differentKindsOfProperties.ll.kt index ff63aa648e2..7b0747618fd 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/differentKindsOfProperties.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/differentKindsOfProperties.ll.kt @@ -2,35 +2,35 @@ // MODULE: m1-common // FILE: common.kt -expect val justVal: String -expect var justVar: String +expect val justVal: String +expect var justVar: String -expect val String.extensionVal: Unit -expect var T.genericExtensionVar: T +expect val String.extensionVal: Unit +expect var T.genericExtensionVar: T -expect val valWithGet: String - get -expect var varWithGetSet: String - get set +expect val valWithGet: String + get +expect var varWithGetSet: String + get set -expect var varWithPlatformGetSet: String +expect var varWithPlatformGetSet: String expect get - expect set + expect set -expect val backingFieldVal: String = "no" -expect var backingFieldVar: String = "no" +expect val backingFieldVal: String = "no" +expect var backingFieldVar: String = "no" -expect val customAccessorVal: String - get() = "no" -expect var customAccessorVar: String +expect val customAccessorVal: String get() = "no" - set(value) {} +expect var customAccessorVar: String + get() = "no" + set(value) {} -expect const val constVal: Int +expect const val constVal: Int -expect lateinit var lateinitVar: String +expect lateinit var lateinitVar: String -expect val delegated: String by Delegate +expect val delegated: String by Delegate object Delegate { operator fun getValue(x: Any?, y: Any?): String = "" } fun test(): String { diff --git a/compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing.ll.kt index bbee0f63844..3d99a97d13d 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing.ll.kt @@ -1,8 +1,8 @@ // MODULE: m1-common // FILE: common.kt -expect class E01 -expect class E02 +expect class E01 +expect class E02 // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing_oldLanguageVersion.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing_oldLanguageVersion.ll.kt index 80fdf22e99d..501cf8ae712 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing_oldLanguageVersion.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/typealias/actualTypealiasToNothing_oldLanguageVersion.ll.kt @@ -2,8 +2,8 @@ // MODULE: m1-common // FILE: common.kt -expect class E01 -expect class E02 +expect class E01 +expect class E02 // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/varSetterVisibility.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/varSetterVisibility.ll.kt index f766656ce76..5edefb51263 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/varSetterVisibility.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/varSetterVisibility.ll.kt @@ -1,20 +1,20 @@ // MODULE: m1-common // FILE: common.kt -expect var v1: Boolean +expect var v1: Boolean expect var v2: Boolean internal set -expect var v3: Boolean - internal set +expect var v3: Boolean + internal set -expect open class C { - var foo: Boolean -} +expect open class C { + var foo: Boolean +} -expect open class C2 { - var foo: Boolean -} +expect open class C2 { + var foo: Boolean +} // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/widerVisibility_expectIsEffectivelyFinal_oldLanguageVersion.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/widerVisibility_expectIsEffectivelyFinal_oldLanguageVersion.ll.kt index 4fd183a538b..bd5cdbf4edd 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/widerVisibility_expectIsEffectivelyFinal_oldLanguageVersion.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/widerVisibility_expectIsEffectivelyFinal_oldLanguageVersion.ll.kt @@ -5,9 +5,9 @@ open class Base { internal open fun foo() {} } -expect class Foo : Base { - override fun foo() -} +expect class Foo : Base { + override fun foo() +} // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt