From 60e5a9c298e4fb112c27e92bf412e3617fd48563 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Wed, 25 Oct 2023 23:43:08 +0200 Subject: [PATCH] [IR] Update testData INCOMPATIBLE_MATCHING ^KT-62916 Fixed (well, actually it got fixed in one of my previous commits, but it's hard to track) Review: https://jetbrains.team/p/kt/reviews/12750/timeline --- .../covariantFunctionOverride.fir.kt | 2 +- .../covariantPropertyOverride.fir.kt | 2 +- .../multiplatform/implicitActualFakeOverride_AbstractMap.fir.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantFunctionOverride.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantFunctionOverride.fir.kt index f7f7dfa7d03..e602591a7e9 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantFunctionOverride.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantFunctionOverride.fir.kt @@ -6,7 +6,7 @@ open class Base { open fun foo(): Any = "" } -expect open class Foo : Base { +expect open class Foo : Base { } // MODULE: m2-jvm()()(m1-common) diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantPropertyOverride.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantPropertyOverride.fir.kt index 5e1eef65265..a5cd37855b1 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantPropertyOverride.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/covariantPropertyOverride.fir.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/implicitActualFakeOverride_AbstractMap.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_AbstractMap.fir.kt index 75a112c4f08..558c2395cc5 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_AbstractMap.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/implicitActualFakeOverride_AbstractMap.fir.kt @@ -3,7 +3,7 @@ // 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 }