8000 [FE 1.0] 2/2 Drop AllowDifferentMembersInActual from compiler and tes… · JetBrains/kotlin@6982fa1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6982fa1

Browse files
nikitabobkoSpace Team
nikitabobko
authored and
Space Team
committed
[FE 1.0] 2/2 Drop AllowDifferentMembersInActual from compiler and testData
The annotation was dropped in the previous commit
1 parent 882f468 commit 6982fa1

File tree

25 files changed

+119
-136
lines changed

25 files changed

+119
-136
lines changed

‎compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ActualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ private fun checkExpectActualScopeDiff(
8686
}
8787
}
8888

89-
private val allowDifferentMembersInActualFqn = FqName("kotlin.AllowDifferentMembersInActual")
90-
9189
@OptIn(ExperimentalContracts::class)
9290
internal fun matchActualWithNonFinalExpect(
9391
declaration: KtDeclaration,
@@ -110,10 +108,6 @@ internal fun matchActualWithNonFinalExpect(
110108

111109
if (!descriptor.isActual) return null
112110

113-
with(OptInUsageChecker) {
114-
if (declaration.isDeclarationAnnotatedWith(allowDifferentMembersInActualFqn, context.trace.bindingContext)) return null
115-
}
116-
117111
val actual = when (descriptor) {
118112
is ClassDescriptor -> descriptor
119113
is TypeAliasDescriptor -> descriptor.classDescriptor

‎compiler/testData/codegen/box/multiplatform/defaultArguments/bothInExpectAndActual2.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ actual interface I {
2121
actual fun test(source: String = "actual")
2222
}
2323

24-
@OptIn(ExperimentalMultiplatform::class)
25-
@AllowDifferentMembersInActual
2624
actual interface J : I {
2725
override fun test(source: String) {
2826
if (source != "actual") throw AssertionError(source)

‎compiler/testData/codegen/box/multiplatform/hmpp/simple.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ fun getB(): B = B()
2626

2727
// MODULE: main()()(intermediate)
2828
// FILE: main.kt
29-
@OptIn(ExperimentalMultiplatform::class)
30-
@AllowDifferentMembersInActual
3129
actual open class A actual constructor() {
3230
fun bar(): String = "K"
3331
}

‎compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,12 @@ class B : A()
1818
// MODULE: platform()()(common)
1919
// FILE: platform.kt
2020

21-
@OptIn(ExperimentalMultiplatform::class)
22-
@AllowDifferentMembersInActual
2321
actual interface S1 {
2422
fun o(): S = "O"
2523
val p: Boolean
2624
get() = true
2725
}
2826

29-
@OptIn(ExperimentalMultiplatform::class)
30-
@AllowDifferentMembersInActual
3127
actual interface S2 {
3228
fun k() = "K"
3329
}

‎compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ class B : A()
1818
// MODULE: platform()()(common)
1919
// FILE: platform.kt
2020

21-
@OptIn(ExperimentalMultiplatform::class)
22-
@AllowDifferentMembersInActual
2321
actual interface S1 {
2422
fun s1() = "O"
2523
}
@@ -28,13 +26,9 @@ interface S20 {
2826
fun s2() = "K"
2927
}
3028

31-
@OptIn(ExperimentalMultiplatform::class)
32-
@AllowDifferentMembersInActual
3329
actual interface S2 : S20 {
3430
}
3531

36-
@OptIn(ExperimentalMultiplatform::class)
37-
@AllowDifferentMembersInActual
3832
actual interface S : S1, S2 {
3933
fun s3() = s1() + s2()
4034
}

‎compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/allowDifferentMembersInActual_class.kt

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/allowDifferentMembersInActual_typealias.kt

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper.fir.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ expect open class Foo : Base {
1414
// MODULE: m2-jvm()()(m1-common)
1515
// FILE: jvm.kt
1616

17-
@OptIn(ExperimentalMultiplatform::class)
18-
@AllowDifferentMembersInActual
1917
actual open class Base {
2018
actual fun existingMethodInBase() {}
2119
open fun injected(): Any = ""

0 commit comments

Comments
 (0)
0