diff options
Diffstat (limited to 'plugins/kotlin/idea/tests/testData/quickfix/experimental')
68 files changed, 72 insertions, 109 deletions
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/annotationInTopLevelProperty.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/annotationInTopLevelProperty.kt index b984a59f3c0c..d2a371be010b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/annotationInTopLevelProperty.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/annotationInTopLevelProperty.kt @@ -1,5 +1,5 @@ // "Propagate 'TopMarker' opt-in requirement to 'topUserVal'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/annotationInTopLevelProperty.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/annotationInTopLevelProperty.kt.after index 6d29de45ce0d..bcf168c30e7a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/annotationInTopLevelProperty.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/annotationInTopLevelProperty.kt.after @@ -1,5 +1,5 @@ // "Propagate 'TopMarker' opt-in requirement to 'topUserVal'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToAnnotationList.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToAnnotationList.kt index 9bf0fe6578b2..97564526a39a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToAnnotationList.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToAnnotationList.kt @@ -1,5 +1,5 @@ // "Opt in for 'A' in containing file 'appendFileAnnotationToAnnotationList.kt'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @file:[ JvmName("Foo") diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToAnnotationList.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToAnnotationList.kt.after index fe2bf749a03f..18037fb00330 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToAnnotationList.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToAnnotationList.kt.after @@ -1,5 +1,5 @@ // "Opt in for 'A' in containing file 'appendFileAnnotationToAnnotationList.kt'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @file:[ JvmName("Foo") diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToOtherFileAnnotations.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToOtherFileAnnotations.kt index 17675dcfe0b5..7ff29f8d94c8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToOtherFileAnnotations.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToOtherFileAnnotations.kt @@ -1,5 +1,5 @@ // "Opt in for 'A' in containing file 'appendFileAnnotationToOtherFileAnnotations.kt'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @file:JvmName("Foo") diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToOtherFileAnnotations.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToOtherFileAnnotations.kt.after index 572667647054..1c99fd44c837 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToOtherFileAnnotations.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToOtherFileAnnotations.kt.after @@ -1,5 +1,5 @@ // "Opt in for 'A' in containing file 'appendFileAnnotationToOtherFileAnnotations.kt'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @file:JvmName("Foo") @file:OptIn(A::class) diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationWithAnnotationList.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationWithAnnotationList.kt index 56199e7be4e8..21d05b738cb3 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationWithAnnotationList.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationWithAnnotationList.kt @@ -1,5 +1,5 @@ // "Opt in for 'A' in containing file 'appendFileAnnotationWithAnnotationList.kt'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @file:[ JvmName("Foo") diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationWithAnnotationList.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationWithAnnotationList.kt.after index a1937fc5a634..6f10e648d0a9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationWithAnnotationList.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationWithAnnotationList.kt.after @@ -1,5 +1,5 @@ // "Opt in for 'A' in containing file 'appendFileAnnotationWithAnnotationList.kt'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @file:[ JvmName("Foo") diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunction.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunction.kt index e87f5d842df8..cf3342c8dcdd 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunction.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunction.kt @@ -1,5 +1,5 @@ // "Propagate 'MyExperimentalAPI' opt-in requirement to 'bar'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunction.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunction.kt.after index fb62d4015b3d..e0b9f386231b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunction.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunction.kt.after @@ -1,5 +1,5 @@ // "Propagate 'MyExperimentalAPI' opt-in requirement to 'bar'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionContainingClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionContainingClass.kt index 9ca3e0a443ee..c0e5084b3048 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionContainingClass.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionContainingClass.kt @@ -1,5 +1,5 @@ // "Propagate 'MyExperimentalAPI' opt-in requirement to containing class 'Bar'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionContainingClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionContainingClass.kt.after index c78a4c0a0335..dd9233850dcc 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionContainingClass.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionContainingClass.kt.after @@ -1,5 +1,5 @@ // "Propagate 'MyExperimentalAPI' opt-in requirement to containing class 'Bar'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionNotApplicable.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionNotApplicable.kt index 27dd1a1d5989..a8c23a9abcfa 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionNotApplicable.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionNotApplicable.kt @@ -6,8 +6,8 @@ // ACTION: Opt in for 'MyExperimentalAPI' on containing class 'Bar' // ACTION: Opt in for 'MyExperimentalAPI' in containing file 'basicFunctionNotApplicable.kt' // ACTION: Add '-opt-in=MyExperimentalAPI' to module light_idea_test_case compiler arguments -// ERROR: This declaration is experimental and its usage must be marked with '@MyExperimentalAPI' or '@OptIn(MyExperimentalAPI::class)' -// ERROR: This declaration is experimental and its usage must be marked with '@MyExperimentalAPI' or '@OptIn(MyExperimentalAPI::class)' +// ERROR: This declaration needs opt-in. Its usage must be marked with '@MyExperimentalAPI' or '@OptIn(MyExperimentalAPI::class)' +// ERROR: This declaration needs opt-in. Its usage must be marked with '@MyExperimentalAPI' or '@OptIn(MyExperimentalAPI::class)' // ERROR: This annotation is not applicable to target 'member function' @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicUseExperimental.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicUseExperimental.kt index 4f2232127c8f..3b00293539cb 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicUseExperimental.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicUseExperimental.kt @@ -1,6 +1,6 @@ // "Opt in for 'MyExperimentalAPI' on 'bar'" "true" // PRIORITY: HIGH -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME package a.b diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicUseExperimental.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicUseExperimental.kt.after index 700c97af0080..962fc31dbb7f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicUseExperimental.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicUseExperimental.kt.after @@ -1,6 +1,6 @@ // "Opt in for 'MyExperimentalAPI' on 'bar'" "true" // PRIORITY: HIGH -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME package a.b diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/classUseExperimental.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/classUseExperimental.kt index 819f495774d4..f1107f1f64aa 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/classUseExperimental.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/classUseExperimental.kt @@ -1,6 +1,6 @@ // "Opt in for 'MyExperimentalAPI' on containing class 'Bar'" "true" // PRIORITY: HIGH -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME package a.b diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/classUseExperimental.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/classUseExperimental.kt.after index cc0f80a62612..883cb2c05aa0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/classUseExperimental.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/classUseExperimental.kt.after @@ -1,6 +1,6 @@ // "Opt in for 'MyExperimentalAPI' on containing class 'Bar'" "true" // PRIORITY: HIGH -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME package a.b diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/existingFileAnnotationWithPackage.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/existingFileAnnotationWithPackage.kt index 8aa08a2cf8b8..55aa91320ecb 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/existingFileAnnotationWithPackage.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/existingFileAnnotationWithPackage.kt @@ -1,5 +1,5 @@ // "Opt in for 'B' in containing file 'existingFileAnnotationWithPackage.kt'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @file:OptIn(A::class) diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/existingFileAnnotationWithPackage.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/existingFileAnnotationWithPackage.kt.after index f33e1604a79f..64d3b0f2f8cd 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/existingFileAnnotationWithPackage.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/existingFileAnnotationWithPackage.kt.after @@ -1,5 +1,5 @@ // "Opt in for 'B' in containing file 'existingFileAnnotationWithPackage.kt'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @file:OptIn(A::class, B::class) diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/experimentalUnused.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/experimentalUnused.kt index 581100aec6c8..7f9454dd4ae8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/experimentalUnused.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/experimentalUnused.kt @@ -1,5 +1,5 @@ // "Safe delete 'Marker'" "false" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn -Xopt-in=test.Marker +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn -opt-in=test.Marker // WITH_RUNTIME // ACTION: Rename file to Marker.kt // TOOL: org.jetbrains.kotlin.idea.inspections.UnusedSymbolInspection diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/experimentalUnused2.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/experimentalUnused2.kt deleted file mode 100644 index b7d809144bfe..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/experimentalUnused2.kt +++ /dev/null @@ -1,10 +0,0 @@ -// "Safe delete 'Marker'" "false" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn -opt-in=test.Marker -// WITH_RUNTIME -// ACTION: Rename file to Marker.kt -// TOOL: org.jetbrains.kotlin.idea.inspections.UnusedSymbolInspection - -package test - -@RequiresOptIn -annotation class <caret>Marker diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsExpression.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsExpression.kt index 820252a29254..31ef3a150000 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsExpression.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsExpression.kt @@ -1,5 +1,5 @@ // "Remove forbidden opt-in annotation targets" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn @Target(<caret>AnnotationTarget.CLASS, AnnotationTarget.EXPRESSION, AnnotationTarget.FUNCTION) diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsExpression.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsExpression.kt.after index af4782c86c12..296b50137b1a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsExpression.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsExpression.kt.after @@ -1,5 +1,5 @@ // "Remove forbidden opt-in annotation targets" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn @Target(<caret>AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsInAnnotation.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsInAnnotation.kt index 5152c963c5fc..29f10e848e27 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsInAnnotation.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsInAnnotation.kt @@ -1,5 +1,5 @@ // "Remove forbidden opt-in annotation targets" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn @Target(<caret>AnnotationTarget.CLASS, AnnotationTarget.TYPE, AnnotationTarget.FUNCTION, AnnotationTarget.FILE) diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsInAnnotation.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsInAnnotation.kt.after index 6874136c695d..affeaec23307 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsInAnnotation.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsInAnnotation.kt.after @@ -1,5 +1,5 @@ // "Remove forbidden opt-in annotation targets" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/functionInLocalClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/functionInLocalClass.kt index de6ed8b5c026..e03cd1ef5a54 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/functionInLocalClass.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/functionInLocalClass.kt @@ -1,5 +1,5 @@ // "Propagate 'MyExperimentalAPI' opt-in requirement to 'outer'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/functionInLocalClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/functionInLocalClass.kt.after index d912b70d06bf..177e98d1902b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/functionInLocalClass.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/functionInLocalClass.kt.after @@ -1,5 +1,5 @@ // "Propagate 'MyExperimentalAPI' opt-in requirement to 'outer'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicit.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicit.kt index c345faaef564..e5e4ef54966c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicit.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicit.kt @@ -1,5 +1,5 @@ // "Move 'SomeOptInAnnotation' opt-in requirement from getter to property" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicit.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicit.kt.after index 3b974107bf3f..9e22c925fcd4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicit.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicit.kt.after @@ -1,5 +1,5 @@ // "Move 'SomeOptInAnnotation' opt-in requirement from getter to property" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicitRemove.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicitRemove.kt index f6b3f5a95822..e68854825a54 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicitRemove.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicitRemove.kt @@ -1,5 +1,5 @@ // "Remove annotation" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicitRemove.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicitRemove.kt.after index 661202585416..01b94726b71f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicitRemove.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicitRemove.kt.after @@ -1,5 +1,5 @@ // "Remove annotation" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicit.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicit.kt index 30bbef7548f8..0a4f785b18f9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicit.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicit.kt @@ -1,5 +1,5 @@ // "Move 'SomeOptInAnnotation' opt-in requirement from getter to property" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicit.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicit.kt.after index c37231219415..1a196c27fcb6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicit.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicit.kt.after @@ -1,5 +1,5 @@ // "Move 'SomeOptInAnnotation' opt-in requirement from getter to property" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicitRemove.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicitRemove.kt index b37085a490f9..c69eb1768bd1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicitRemove.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicitRemove.kt @@ -1,5 +1,5 @@ // "Remove annotation" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicitRemove.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicitRemove.kt.after index a5d78ce56058..43d50c749d93 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicitRemove.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicitRemove.kt.after @@ -1,5 +1,5 @@ // "Remove annotation" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localFunction.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localFunction.kt index bf75d4e271a2..799f14f582f9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localFunction.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localFunction.kt @@ -1,5 +1,5 @@ // "Propagate 'MyExperimentalAPI' opt-in requirement to 'outer'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localFunction.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localFunction.kt.after index 9e752d4d4ce8..8edbc4c76de6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localFunction.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localFunction.kt.after @@ -1,5 +1,5 @@ // "Propagate 'MyExperimentalAPI' opt-in requirement to 'outer'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationNoInitRemove.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationNoInitRemove.kt index cc7c16589074..afd31260f12e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationNoInitRemove.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationNoInitRemove.kt @@ -1,5 +1,5 @@ // "Remove annotation" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationNoInitRemove.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationNoInitRemove.kt.after index fc176f7e878e..b3abe9fe5b3b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationNoInitRemove.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationNoInitRemove.kt.after @@ -1,5 +1,5 @@ // "Remove annotation" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationRemove.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationRemove.kt index fb5d4d363d2a..f5a9ff232d13 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationRemove.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationRemove.kt @@ -1,5 +1,5 @@ // "Remove annotation" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationRemove.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationRemove.kt.after index bb022c6b0e26..10992f8d9f4d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationRemove.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationRemove.kt.after @@ -1,5 +1,5 @@ // "Remove annotation" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableNoGetterAction.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableNoGetterAction.kt index fb0bc3056bef..8185a88e2101 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableNoGetterAction.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableNoGetterAction.kt @@ -1,5 +1,5 @@ // "Move '@SomeOptInAnnotation' annotation from getter to property" "false" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME // ACTION: Remove annotation // ERROR: Opt-in requirement marker annotation cannot be used on variable diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/nestedClasses.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/nestedClasses.kt index 102adf136630..ccdb238df866 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/nestedClasses.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/nestedClasses.kt @@ -8,7 +8,7 @@ // ACTION: Opt in for 'MyExperimentalAPI' in containing file 'nestedClasses.kt' // ACTION: Add '-opt-in=MyExperimentalAPI' to module light_idea_test_case compiler arguments // ACTION: Introduce import alias -// ERROR: This declaration is experimental and its usage must be marked with '@MyExperimentalAPI' or '@OptIn(MyExperimentalAPI::class)' +// ERROR: This declaration needs opt-in. Its usage must be marked with '@MyExperimentalAPI' or '@OptIn(MyExperimentalAPI::class)' @RequiresOptIn annotation class MyExperimentalAPI diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/newFileAnnotationWithPackage.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/newFileAnnotationWithPackage.kt index e9516225e0b0..16170d292226 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/newFileAnnotationWithPackage.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/newFileAnnotationWithPackage.kt @@ -1,5 +1,5 @@ // "Opt in for 'A' in containing file 'newFileAnnotationWithPackage.kt'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME package p diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/newFileAnnotationWithPackage.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/newFileAnnotationWithPackage.kt.after index 1447a589dc24..74453e9589bf 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/newFileAnnotationWithPackage.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/newFileAnnotationWithPackage.kt.after @@ -1,5 +1,5 @@ // "Opt in for 'A' in containing file 'newFileAnnotationWithPackage.kt'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @file:OptIn(A::class) diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/override.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/override.kt index d9d5b8bf16d6..eb6376704fd1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/override.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/override.kt @@ -8,7 +8,7 @@ // ACTION: Add '-opt-in=MyExperimentalAPI' to module light_idea_test_case compiler arguments // ACTION: Enable a trailing comma by default in the formatter // ACTION: Go To Super Method -// ERROR: This declaration overrides experimental member of supertype 'Base' and must be annotated with '@MyExperimentalAPI' +// ERROR: Base declaration of supertype 'Base' needs opt-in. The declaration override must be annotated with '@MyExperimentalAPI' or '@OptIn(MyExperimentalAPI::class)' @RequiresOptIn @Target(AnnotationTarget.FUNCTION) diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/overrideAnnotationRemove.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/overrideAnnotationRemove.kt deleted file mode 100644 index 434cf3d11133..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/overrideAnnotationRemove.kt +++ /dev/null @@ -1,15 +0,0 @@ -// "Remove annotation" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn -// WITH_RUNTIME - -@RequiresOptIn -annotation class SomeOptInAnnotation - -open class Base { - open fun foo() {} -} - -class Derived : Base() { - <caret>@SomeOptInAnnotation - override fun foo() {} -} diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/overrideAnnotationRemove.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/overrideAnnotationRemove.kt.after deleted file mode 100644 index b81d3ee301ed..000000000000 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/overrideAnnotationRemove.kt.after +++ /dev/null @@ -1,14 +0,0 @@ -// "Remove annotation" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn -// WITH_RUNTIME - -@RequiresOptIn -annotation class SomeOptInAnnotation - -open class Base { - open fun foo() {} -} - -class Derived : Base() { - override fun foo() {} -} diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructor.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructor.kt index 2486d8fb2d18..78e22690e719 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructor.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructor.kt @@ -1,5 +1,5 @@ // "Propagate 'PropertyTypeMarker' opt-in requirement to constructor" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME // ACTION: Propagate 'PropertyTypeMarker' opt-in requirement to containing class 'PropertyTypeContainer' diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructor.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructor.kt.after index d6f59076bad9..99f4d6d98d03 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructor.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructor.kt.after @@ -1,5 +1,5 @@ // "Propagate 'PropertyTypeMarker' opt-in requirement to constructor" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME // ACTION: Propagate 'PropertyTypeMarker' opt-in requirement to containing class 'PropertyTypeContainer' diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToClass.kt index 71b4c3cbc179..2a0783e15251 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToClass.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToClass.kt @@ -1,5 +1,5 @@ // "Opt in for 'PropertyTypeMarker' on containing class 'PropertyTypeContainer'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME // ACTION: Opt in for 'PropertyTypeMarker' on constructor diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToClass.kt.after index 7afd56a61d26..239c9e62cef7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToClass.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToClass.kt.after @@ -1,5 +1,5 @@ // "Opt in for 'PropertyTypeMarker' on containing class 'PropertyTypeContainer'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME // ACTION: Opt in for 'PropertyTypeMarker' on constructor diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToConstructor.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToConstructor.kt index be36ea913563..308a7b1ba2b5 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToConstructor.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToConstructor.kt @@ -1,5 +1,5 @@ // "Opt in for 'PropertyTypeMarker' on constructor" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME // ACTION: Opt in for 'PropertyTypeMarker' on containing class 'PropertyTypeMarker' diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToConstructor.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToConstructor.kt.after index 74a5c9659d7c..4d43027b0a79 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToConstructor.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToConstructor.kt.after @@ -1,5 +1,5 @@ // "Opt in for 'PropertyTypeMarker' on constructor" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME // ACTION: Opt in for 'PropertyTypeMarker' on containing class 'PropertyTypeMarker' diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/reservedKeywordPackage.test b/plugins/kotlin/idea/tests/testData/quickfix/experimental/reservedKeywordPackage.test index d87f01b9e73b..4fad1fef7170 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/reservedKeywordPackage.test +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/reservedKeywordPackage.test @@ -1,8 +1,8 @@ // FILE: first.before.kt // "Opt in for 'Ann' on 'test'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME -// ERROR: This declaration is experimental and its usage must be marked with '@fun.optin.Ann' or '@OptIn(fun.optin.Ann::class)' +// ERROR: This declaration needs opt-in. Its usage must be marked with '@fun.optin.Ann' or '@OptIn(fun.optin.Ann::class)' import `fun`.optin.C fun test(c: C<caret>) { @@ -21,9 +21,9 @@ class C // FILE: first.after.kt // "Opt in for 'Ann' on 'test'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME -// ERROR: This declaration is experimental and its usage must be marked with '@fun.optin.Ann' or '@OptIn(fun.optin.Ann::class)' +// ERROR: This declaration needs opt-in. Its usage must be marked with '@fun.optin.Ann' or '@OptIn(fun.optin.Ann::class)' import `fun`.optin.Ann import `fun`.optin.C diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/reservedKeywordPackage2.test b/plugins/kotlin/idea/tests/testData/quickfix/experimental/reservedKeywordPackage2.test index 3321b647f78b..de51a65cb4e2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/reservedKeywordPackage2.test +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/reservedKeywordPackage2.test @@ -1,8 +1,8 @@ // FILE: first.before.kt // "Propagate 'Ann' opt-in requirement to 'test'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME -// ERROR: This declaration is experimental and its usage must be marked with '@fun.optin.Ann' or '@OptIn(fun.optin.Ann::class)' +// ERROR: This declaration needs opt-in. Its usage must be marked with '@fun.optin.Ann' or '@OptIn(fun.optin.Ann::class)' import `fun`.optin.C fun test(c: C<caret>) { @@ -21,9 +21,9 @@ class C // FILE: first.after.kt // "Propagate 'Ann' opt-in requirement to 'test'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME -// ERROR: This declaration is experimental and its usage must be marked with '@fun.optin.Ann' or '@OptIn(fun.optin.Ann::class)' +// ERROR: This declaration needs opt-in. Its usage must be marked with '@fun.optin.Ann' or '@OptIn(fun.optin.Ann::class)' import `fun`.optin.Ann import `fun`.optin.C diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOn.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOn.kt index 2bbd72cc0f16..759629c4c4c4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOn.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOn.kt @@ -3,6 +3,7 @@ // COMPILER_ARGUMENTS_AFTER: -version -opt-in=kotlin.RequiresOptIn // DISABLE-ERRORS // WITH_RUNTIME +// LANGUAGE_VERSION: 1.6 @RequiresOptIn<caret> annotation class MyExperimentalAPI diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOn.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOn.kt.after index 34eecd50d60c..504505641a16 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOn.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOn.kt.after @@ -3,6 +3,7 @@ // COMPILER_ARGUMENTS_AFTER: -version -opt-in=kotlin.RequiresOptIn // DISABLE-ERRORS // WITH_RUNTIME +// LANGUAGE_VERSION: 1.6 @RequiresOptIn annotation class MyExperimentalAPI diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOnWithAnotherMarker.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOnWithAnotherMarker.kt index 35ae0128c93a..09f76af0b90c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOnWithAnotherMarker.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOnWithAnotherMarker.kt @@ -3,6 +3,7 @@ // COMPILER_ARGUMENTS_AFTER: -version -opt-in=AnotherMarker -opt-in=kotlin.RequiresOptIn // DISABLE-ERRORS // WITH_RUNTIME +// LANGUAGE_VERSION: 1.6 @RequiresOptIn<caret> annotation class MyExperimentalAPI diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOnWithAnotherMarker.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOnWithAnotherMarker.kt.after index 3afda672360a..bafed185cd37 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOnWithAnotherMarker.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOnWithAnotherMarker.kt.after @@ -3,6 +3,7 @@ // COMPILER_ARGUMENTS_AFTER: -version -opt-in=AnotherMarker -opt-in=kotlin.RequiresOptIn // DISABLE-ERRORS // WITH_RUNTIME +// LANGUAGE_VERSION: 1.6 @RequiresOptIn annotation class MyExperimentalAPI diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeAlias.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeAlias.kt index 6b1e6e5ab668..9d4679f5cc24 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeAlias.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeAlias.kt @@ -1,7 +1,6 @@ // "Opt in for 'AliasMarker' on 'AliasMarkerUsage'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME -// ACTION: Add '-Xopt-in=AliasMarker' to module light_idea_test_case compiler arguments @RequiresOptIn annotation class AliasMarker diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeAlias.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeAlias.kt.after index 0e5460cc6908..b552ba99d797 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeAlias.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeAlias.kt.after @@ -1,7 +1,6 @@ // "Opt in for 'AliasMarker' on 'AliasMarkerUsage'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME -// ACTION: Add '-Xopt-in=AliasMarker' to module light_idea_test_case compiler arguments @RequiresOptIn annotation class AliasMarker diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeInTopLevelProperty.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeInTopLevelProperty.kt index 32a2517aa1ee..0b44ab8330e2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeInTopLevelProperty.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeInTopLevelProperty.kt @@ -1,5 +1,5 @@ // "Propagate 'TopMarker' opt-in requirement to 'topUserVal'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeInTopLevelProperty.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeInTopLevelProperty.kt.after index 6d29de45ce0d..bcf168c30e7a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeInTopLevelProperty.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeInTopLevelProperty.kt.after @@ -1,5 +1,5 @@ // "Propagate 'TopMarker' opt-in requirement to 'topUserVal'" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationAddExplicitUseSite.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationAddExplicitUseSite.kt index 25f21d98a806..0811111519cf 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationAddExplicitUseSite.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationAddExplicitUseSite.kt @@ -1,5 +1,5 @@ // "Move 'SomeOptInAnnotation' opt-in requirement from value parameter to property" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationAddExplicitUseSite.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationAddExplicitUseSite.kt.after index 60a363d4f9e0..0d0c6c42b8c9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationAddExplicitUseSite.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationAddExplicitUseSite.kt.after @@ -1,5 +1,5 @@ // "Move 'SomeOptInAnnotation' opt-in requirement from value parameter to property" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationRemove.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationRemove.kt index fbc1d76a6392..6642efd9b5f6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationRemove.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationRemove.kt @@ -1,5 +1,5 @@ // "Remove annotation" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationRemove.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationRemove.kt.after index 7ca9de802b01..d839d3980f7e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationRemove.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationRemove.kt.after @@ -1,5 +1,5 @@ // "Remove annotation" "true" -// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn +// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn // WITH_RUNTIME @RequiresOptIn |