[k1/K2]: Mark @SubclassOptInRequired as an experimental

BlondeHex · Space Team · commit ad9025afa662 · 2024-01-15T14:54:36.000Z
At the moment, SubclassOptInRequired is marked with the
ExperimentalSubclassOptIn annotation. However, it does not work
as expected due to a missing opt-in error. To use SubclassOptInRequired,
an explicit opt-in is necessary because SubclassOptInRequired is an
unstable feature now.

^KT-64739
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
diff --git a/compiler/fir/analysis-tests/testData/builtIns/kotlin.txt b/compiler/fir/analysis-tests/testData/builtIns/kotlin.txt
@@ -601,7 +601,7 @@ public abstract class Enum<E : R|kotlin/Enum<E>|> : R|kotlin/Comparable<E>|, R|j
 
 }
 
-@R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|kotlin/annotation/Retention|(value = R|kotlin/annotation/AnnotationRetention.BINARY|) @R|kotlin/SinceKotlin|(version = String(1.8)) public final annotation class ExperimentalSubclassOptIn : R|kotlin/Annotation| {
+@R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|kotlin/annotation/Retention|(value = R|kotlin/annotation/AnnotationRetention.BINARY|) @R|kotlin/SinceKotlin|(version = String(1.8)) @R|kotlin/RequiresOptIn|() public final annotation class ExperimentalSubclassOptIn : R|kotlin/Annotation| {
     public constructor(): R|kotlin/ExperimentalSubclassOptIn|
 
 }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/ClassIdDiagnosticRendering.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/ClassIdDiagnosticRendering.fir.txt
@@ -1,4 +1,5 @@
 FILE: ClassIdDiagnosticRendering.kt
+    @FILE:R|kotlin/OptIn|(markerClass = vararg(<getClass>(Q|kotlin/ExperimentalSubclassOptIn|)))
     package a.b.c
 
     @R|kotlin/RequiresOptIn|() public final annotation class Marker : R|kotlin/Annotation| {
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/ClassIdDiagnosticRendering.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/ClassIdDiagnosticRendering.kt
@@ -1,4 +1,5 @@
 // WITH_EXTENDED_CHECKERS
+@file:OptIn(ExperimentalSubclassOptIn::class)
 
 package a.b.c
 
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
diff --git a/compiler/testData/builtin-classes/default/kotlin.txt b/compiler/testData/builtin-classes/default/kotlin.txt
@@ -347,7 +347,7 @@ public abstract class Enum</*0*/ E : kotlin.Enum<E>> : kotlin.Comparable<E> {
     /*primary*/ public constructor ExperimentalStdlibApi()
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") public final annotation class ExperimentalSubclassOptIn : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") @kotlin.RequiresOptIn public final annotation class ExperimentalSubclassOptIn : kotlin.Annotation {
     /*primary*/ public constructor ExperimentalSubclassOptIn()
 }
 
diff --git a/compiler/testData/builtin-classes/java6/kotlin.txt b/compiler/testData/builtin-classes/java6/kotlin.txt
@@ -362,7 +362,7 @@ public abstract class Enum</*0*/ E : kotlin.Enum<E>> : kotlin.Comparable<E>, jav
     /*primary*/ public constructor ExperimentalStdlibApi()
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") public final annotation class ExperimentalSubclassOptIn : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") @kotlin.RequiresOptIn public final annotation class ExperimentalSubclassOptIn : kotlin.Annotation {
     /*primary*/ public constructor ExperimentalSubclassOptIn()
 }
 
diff --git a/compiler/testData/builtin-classes/java8/kotlin.txt b/compiler/testData/builtin-classes/java8/kotlin.txt
@@ -364,7 +364,7 @@ public abstract class Enum</*0*/ E : kotlin.Enum<E>> : kotlin.Comparable<E>, jav
     /*primary*/ public constructor ExperimentalStdlibApi()
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") public final annotation class ExperimentalSubclassOptIn : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") @kotlin.RequiresOptIn public final annotation class ExperimentalSubclassOptIn : kotlin.Annotation {
     /*primary*/ public constructor ExperimentalSubclassOptIn()
 }
 
diff --git a/compiler/testData/builtin-classes/newMethods/kotlin.txt b/compiler/testData/builtin-classes/newMethods/kotlin.txt
@@ -362,7 +362,7 @@ public abstract class Enum</*0*/ E : kotlin.Enum<E>> : kotlin.Comparable<E>, jav
     /*primary*/ public constructor ExperimentalStdlibApi()
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") public final annotation class ExperimentalSubclassOptIn : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") @kotlin.RequiresOptIn public final annotation class ExperimentalSubclassOptIn : kotlin.Annotation {
     /*primary*/ public constructor ExperimentalSubclassOptIn()
 }
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/CorrectApplicability.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/CorrectApplicability.kt
@@ -1,4 +1,5 @@
 // FIR_IDENTICAL
+@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class ApiMarker
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Experimentality.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Experimentality.kt
@@ -0,0 +1,7 @@
+// FIR_IDENTICAL
+
+@RequiresOptIn
+annotation class ApiMarker
+
+@<!OPT_IN_USAGE_ERROR!>SubclassOptInRequired<!>(ApiMarker::class)
+open class OpenKlass
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/IncorrectApplicability.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/IncorrectApplicability.kt
@@ -1,4 +1,5 @@
 // FIR_IDENTICAL
+@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class ApiMarker
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InheritingByLocalClassifiers.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InheritingByLocalClassifiers.kt
@@ -1,4 +1,5 @@
 // FIR_IDENTICAL
+@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class ApiMarker
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InheritingDifferentOptInLevels.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InheritingDifferentOptInLevels.kt
@@ -1,4 +1,5 @@
 // FIR_IDENTICAL
+@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class ApiMarker
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InnerAndNestedClasses.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InnerAndNestedClasses.kt
@@ -1,4 +1,5 @@
 // FIR_IDENTICAL
+@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class Api
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InnerClasses.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InnerClasses.kt
@@ -1,4 +1,5 @@
 // FIR_IDENTICAL
+@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class Boom
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NestedClasses.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NestedClasses.kt
@@ -1,4 +1,5 @@
 // FIR_IDENTICAL
+@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class Boom
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.kt
@@ -1,4 +1,5 @@
 // FIR_IDENTICAL
+@file:OptIn(ExperimentalSubclassOptIn::class)
 
 annotation class DummyAnnotation
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.fir.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalSubclassOptIn::class)
+
 @RequiresOptIn
 annotation class ApiMarker
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalSubclassOptIn::class)
+
 @RequiresOptIn
 annotation class ApiMarker
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/UsageOptInIsNotImplied.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/UsageOptInIsNotImplied.kt
@@ -1,4 +1,5 @@
 // FIR_IDENTICAL
+@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class ApiMarker
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithAbstractClasses.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithAbstractClasses.kt
@@ -1,4 +1,5 @@
 // FIR_IDENTICAL
+@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class ApiMarker
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithInheritanceByDelegation.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithInheritanceByDelegation.kt
@@ -1,4 +1,5 @@
 // FIR_IDENTICAL
+@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class ApiMarker
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithInterfaces.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithInterfaces.kt
@@ -1,4 +1,5 @@
 // FIR_IDENTICAL
+@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class ApiMarker
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithOpenClasses.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithOpenClasses.kt
@@ -1,4 +1,5 @@
 // FIR_IDENTICAL
+@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class ApiMarker
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
diff --git a/libraries/stdlib/api/js/kotlin.kt b/libraries/stdlib/api/js/kotlin.kt
@@ -1599,6 +1599,7 @@ public final annotation class ExperimentalStdlibApi : kotlin.Annotation {
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS})
 @kotlin.annotation.Retention(value = AnnotationRetention.BINARY)
 @kotlin.SinceKotlin(version = "1.8")
+@kotlin.RequiresOptIn
 public final annotation class ExperimentalSubclassOptIn : kotlin.Annotation {
     public constructor ExperimentalSubclassOptIn()
 }
diff --git a/libraries/stdlib/src/kotlin/annotations/OptIn.kt b/libraries/stdlib/src/kotlin/annotations/OptIn.kt
@@ -144,6 +144,7 @@ public annotation class OptIn(
 @Target(CLASS)
 @Retention(BINARY)
 @SinceKotlin("1.8")
+@RequiresOptIn
 public annotation class ExperimentalSubclassOptIn
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ public abstract class Enum<E : R\|kotlin/Enum<E>\|> : R\|kotlin/Comparable<E>\|, R\|j`
`601`	`601`
`602`	`602`	`}`
`603`	`603`
`604`		`-@R\|kotlin/annotation/Target\|(allowedTargets = <implicitArrayOf>(R\|kotlin/annotation/AnnotationTarget.CLASS\|)) @R\|kotlin/annotation/Retention\|(value = R\|kotlin/annotation/AnnotationRetention.BINARY\|) @R\|kotlin/SinceKotlin\|(version = String(1.8)) public final annotation class ExperimentalSubclassOptIn : R\|kotlin/Annotation\| {`
	`604`	`+@R\|kotlin/annotation/Target\|(allowedTargets = <implicitArrayOf>(R\|kotlin/annotation/AnnotationTarget.CLASS\|)) @R\|kotlin/annotation/Retention\|(value = R\|kotlin/annotation/AnnotationRetention.BINARY\|) @R\|kotlin/SinceKotlin\|(version = String(1.8)) @R\|kotlin/RequiresOptIn\|() public final annotation class ExperimentalSubclassOptIn : R\|kotlin/Annotation\| {`
`605`	`605`	`public constructor(): R\|kotlin/ExperimentalSubclassOptIn\|`
`606`	`606`
`607`	`607`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`FILE: ClassIdDiagnosticRendering.kt`
	`2`	`+ @FILE:R\|kotlin/OptIn\|(markerClass = vararg(<getClass>(Q\|kotlin/ExperimentalSubclassOptIn\|)))`
`2`	`3`	`package a.b.c`
`3`	`4`
`4`	`5`	`@R\|kotlin/RequiresOptIn\|() public final annotation class Marker : R\|kotlin/Annotation\| {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// WITH_EXTENDED_CHECKERS`
	`2`	`+@file:OptIn(ExperimentalSubclassOptIn::class)`
`2`	`3`
`3`	`4`	`package a.b.c`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ public abstract class Enum</0/ E : kotlin.Enum<E>> : kotlin.Comparable<E> {`
`347`	`347`	`/primary/ public constructor ExperimentalStdlibApi()`
`348`	`348`	`}`
`349`	`349`
`350`		`-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") public final annotation class ExperimentalSubclassOptIn : kotlin.Annotation {`
	`350`	`+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") @kotlin.RequiresOptIn public final annotation class ExperimentalSubclassOptIn : kotlin.Annotation {`
`351`	`351`	`/primary/ public constructor ExperimentalSubclassOptIn()`
`352`	`352`	`}`
`353`	`353`
Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ public abstract class Enum</0/ E : kotlin.Enum<E>> : kotlin.Comparable<E>, jav`
`362`	`362`	`/primary/ public constructor ExperimentalStdlibApi()`
`363`	`363`	`}`
`364`	`364`
`365`		`-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") public final annotation class ExperimentalSubclassOptIn : kotlin.Annotation {`
	`365`	`+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") @kotlin.RequiresOptIn public final annotation class ExperimentalSubclassOptIn : kotlin.Annotation {`
`366`	`366`	`/primary/ public constructor ExperimentalSubclassOptIn()`
`367`	`367`	`}`
`368`	`368`
Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ public abstract class Enum</0/ E : kotlin.Enum<E>> : kotlin.Comparable<E>, jav`
`364`	`364`	`/primary/ public constructor ExperimentalStdlibApi()`
`365`	`365`	`}`
`366`	`366`
`367`		`-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") public final annotation class ExperimentalSubclassOptIn : kotlin.Annotation {`
	`367`	`+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") @kotlin.RequiresOptIn public final annotation class ExperimentalSubclassOptIn : kotlin.Annotation {`
`368`	`368`	`/primary/ public constructor ExperimentalSubclassOptIn()`
`369`	`369`	`}`
`370`	`370`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// FIR_IDENTICAL`
	`2`	`+@file:OptIn(ExperimentalSubclassOptIn::class)`
`2`	`3`
`3`	`4`	`@RequiresOptIn`
`4`	`5`	`annotation class ApiMarker`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+@file:OptIn(ExperimentalSubclassOptIn::class)`
	`2`	`+`
`1`	`3`	`@RequiresOptIn`
`2`	`4`	`annotation class ApiMarker`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1599,6 +1599,7 @@ public final annotation class ExperimentalStdlibApi : kotlin.Annotation {`
`1599`	`1599`	`@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS})`
`1600`	`1600`	`@kotlin.annotation.Retention(value = AnnotationRetention.BINARY)`
`1601`	`1601`	`@kotlin.SinceKotlin(version = "1.8")`
	`1602`	`+@kotlin.RequiresOptIn`
`1602`	`1603`	`public final annotation class ExperimentalSubclassOptIn : kotlin.Annotation {`
`1603`	`1604`	`public constructor ExperimentalSubclassOptIn()`
`1604`	`1605`	`}`