From e6bfcc7c65bcba8710daa196d55ce741af16e83e Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Thu, 16 Nov 2023 15:02:48 +0100 Subject: [PATCH] [FIR] 2/2 update testData This tests started failing after the previous commit. I extract this change into a separate commit to make it obvious that appeared diagnostics is not an expected behavior. I will fix these tests in the following commits Review: https://jetbrains.team/p/kt/reviews/13094/timeline --- .../actualAnnotationsNotMatchExpect/fakeOverrides.fir.kt | 2 +- .../actualAnnotationsNotMatchExpect/fakeOverrides.ll.kt | 2 +- ...rride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt | 2 +- .../tests/multiplatform/java/inheritedJavaMembers.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/fakeOverrides.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/fakeOverrides.fir.kt index 7d5775e79c2..23ce12502c4 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/fakeOverrides.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/fakeOverrides.fir.kt @@ -20,7 +20,7 @@ expect class FakeOverrideActual : I { // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt -actual class FakeOverrideExpect : A() { +actual class FakeOverrideExpect : A() { override fun noAnnotationOnActual() {} } diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/fakeOverrides.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/fakeOverrides.ll.kt index 7fa00c05328..a0b208ac00f 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/fakeOverrides.ll.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/fakeOverrides.ll.kt @@ -20,7 +20,7 @@ expect class FakeOverrideActual : I { // MODULE: m1-jvm()()(m1-common) // FILE: jvm.kt -actual class FakeOverrideExpect : A() { +actual class FakeOverrideExpect : A() { override fun noAnnotationOnActual() {} } diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt b/compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt index 102586f57f6..438163540ab 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualFakeOverride_paramsAreCompatibleViaSharedMethodWithDefaultParams.kt @@ -9,4 +9,4 @@ expect class Foo : Shared // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt -actual class Foo : Shared +actual class Foo : Shared diff --git a/compiler/testData/diagnostics/tests/multiplatform/java/inheritedJavaMembers.kt b/compiler/testData/diagnostics/tests/multiplatform/java/inheritedJavaMembers.kt index c06cca89d53..aed93a1dccd 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/java/inheritedJavaMembers.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/java/inheritedJavaMembers.kt @@ -51,7 +51,7 @@ public actual open class FastArrayList internal constructor( var array: Array, var _size: Int = array.size, var arrayCapacity: Int = array.size, -) : AbstractMutableList(), MutableListEx, RandomAccess { +) : AbstractMutableList(), MutableListEx, RandomAccess { public actual constructor() : this(arrayOfNulls(16), 0) {} public actual constructor(initialCapacity: Int) : this(arrayOfNulls(initialCapacity), 0) {} public actual constructor(elements: Collection) : this(elements.toTypedArray()) {}