From b231e69cd32eabec005b284aa31f4d35f656925c Mon Sep 17 00:00:00 2001 From: Alejandro Serrano Mena Date: Wed, 18 Oct 2023 12:25:37 +0200 Subject: [PATCH] Remove unneeded K1/K2 split in test --- ...ectTargetsForExperimentalAnnotation.fir.kt | 147 ------------------ ...correctTargetsForExperimentalAnnotation.kt | 2 + 2 files changed, 2 insertions(+), 147 deletions(-) delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/experimental/incorrectTargetsForExperimentalAnnotation.fir.kt diff --git a/compiler/testData/diagnostics/testsWithStdLib/experimental/incorrectTargetsForExperimentalAnnotation.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/experimental/incorrectTargetsForExperimentalAnnotation.fir.kt deleted file mode 100644 index d72f4991b1c..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/experimental/incorrectTargetsForExperimentalAnnotation.fir.kt +++ /dev/null @@ -1,147 +0,0 @@ -// !OPT_IN: kotlin.RequiresOptIn -// FILE: api.kt - -package api - -import kotlin.annotation.AnnotationTarget.* - -@RequiresOptIn(level = RequiresOptIn.Level.WARNING) -@Target(CLASS, ANNOTATION_CLASS, PROPERTY, FIELD, LOCAL_VARIABLE, VALUE_PARAMETER, CONSTRUCTOR, FUNCTION, - PROPERTY_SETTER, TYPEALIAS) -@Retention(AnnotationRetention.BINARY) -annotation class E1 - -@RequiresOptIn(level = RequiresOptIn.Level.WARNING) -@Target(FILE) -annotation class E2 - -@RequiresOptIn(level = RequiresOptIn.Level.WARNING) -@Target(EXPRESSION) -@Retention(AnnotationRetention.SOURCE) -annotation class E3 - -@RequiresOptIn(level = RequiresOptIn.Level.WARNING) -@Target(TYPE_PARAMETER) -@Retention(AnnotationRetention.BINARY) -annotation class E3A - -@RequiresOptIn(level = RequiresOptIn.Level.WARNING) -@Target(TYPE) -@Retention(AnnotationRetention.BINARY) -annotation class E3B - -@RequiresOptIn(level = RequiresOptIn.Level.WARNING) -@Target(PROPERTY_GETTER) -@Retention(AnnotationRetention.BINARY) -annotation class E4 - -@RequiresOptIn(level = RequiresOptIn.Level.WARNING) -@Target(PROPERTY_SETTER) -@Retention(AnnotationRetention.BINARY) -annotation class E5 - -@RequiresOptIn(level = RequiresOptIn.Level.WARNING) -@Target(PROPERTY, FUNCTION, PROPERTY_SETTER, VALUE_PARAMETER, FIELD, LOCAL_VARIABLE, CLASS) -@Retention(AnnotationRetention.BINARY) -annotation class E6 - -var some: Int - @E4 - get() = 42 - @E5 - set(value) {} - -@get:E4 -val another: Int = 42 - -class My { - @E6 - override fun hashCode() = 0 -} - -interface Base { - val bar: Int - - val baz: Int - - @E6 - fun foo() - - fun String.withReceiver() -} - -class Derived : Base { - @E6 - override val bar: Int = 42 - - @set:E6 @setparam:E6 - override var baz: Int = 13 - - @E6 - override fun foo() {} - - override fun @receiver:E6 String.withReceiver() {} -} - -class Wrapper(@property:E6 val foo: Int) - -@E6 -interface BaseMarked { - val bar: Int -} - -@E6 -class Outer { - interface Nested { - val baz: Int - } -} - -@OptIn(E6::class) -class DerivedOptIn : BaseMarked, Outer.Nested { - @E6 - override val bar: Int = 42 // Ok - - @E6 - override val baz: Int = 24 // Ok -} - -abstract class Another(@param:E6 val x: String) : Base { - @delegate:E6 - override val bar: Int by lazy { 42 } - - fun baz(@E6 param: Int) { - @E6 val x = param - } -} - -interface A { - fun f() -} - -interface B { - @E6 - fun f() -} - -interface C1 : A, B -interface C2 : B, A - -class X1 : C1 { - @E6 // Ok - override fun f() {} -} - -class X2 : C2 { - @E6 // Ok - override fun f() {} -} - -open class Y(val b: B): B by b - -class Z(b: B) : Y(b) { - @E6 - override fun f() {} -} - -class WithSetter(@set:E6 var withSetter: String) diff --git a/compiler/testData/diagnostics/testsWithStdLib/experimental/incorrectTargetsForExperimentalAnnotation.kt b/compiler/testData/diagnostics/testsWithStdLib/experimental/incorrectTargetsForExperimentalAnnotation.kt index 29a7ee1c244..63c042a88a4 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/experimental/incorrectTargetsForExperimentalAnnotation.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/experimental/incorrectTargetsForExperimentalAnnotation.kt @@ -1,4 +1,6 @@ +// FIR_IDENTICAL // !OPT_IN: kotlin.RequiresOptIn +// DIAGNOSTICS: -POTENTIALLY_NON_REPORTED_ANNOTATION // FILE: api.kt package api