-
Notifications
You must be signed in to change notification settings - Fork 5.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove @ExperimentalSubclassOptIn from SubclassOptInRequired
Tests are updated. ^KT-71222 Fixed
- Loading branch information
1 parent
f414e45
commit d6a78dd
Showing
26 changed files
with
27 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
compiler/fir/analysis-tests/testData/resolveWithStdlib/ClassIdDiagnosticRendering.fir.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
compiler/fir/analysis-tests/testData/resolveWithStdlib/ClassIdDiagnosticRendering.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
// WITH_EXTRA_CHECKERS | ||
@file:OptIn(ExperimentalSubclassOptIn::class) | ||
|
||
package a.b.c | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
...ata/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/CorrectApplicability.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
// FIR_IDENTICAL | ||
@file:OptIn(ExperimentalSubclassOptIn::class) | ||
|
||
@RequiresOptIn | ||
annotation class ApiMarker | ||
|
1 change: 0 additions & 1 deletion
1
...nostics/testsWithStdLib/annotations/subclassOptInRequired/DiagnosticDefaultMessage.fir.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
@file:OptIn(ExperimentalSubclassOptIn::class) | ||
@RequiresOptIn | ||
annotation class ApiMarker | ||
|
||
|
1 change: 0 additions & 1 deletion
1
...diagnostics/testsWithStdLib/annotations/subclassOptInRequired/DiagnosticDefaultMessage.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
@file:OptIn(ExperimentalSubclassOptIn::class) | ||
@RequiresOptIn | ||
annotation class ApiMarker | ||
|
||
|
13 changes: 13 additions & 0 deletions
13
...Data/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Experimentality.fir.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
// ALLOW_DANGEROUS_LANGUAGE_VERSION_TESTING | ||
// LANGUAGE_VERSION: 2.0 | ||
// API_VERSION: 2.0 | ||
|
||
@RequiresOptIn | ||
annotation class ApiMarker | ||
|
||
@<!OPT_IN_USAGE_ERROR!>SubclassOptInRequired<!>(ApiMarker::class) | ||
open class OpenKlassA | ||
|
||
@OptIn(ExperimentalSubclassOptIn::class) | ||
@SubclassOptInRequired(ApiMarker::class) | ||
open class OpenKlassB |
12 changes: 9 additions & 3 deletions
12
...testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Experimentality.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,13 @@ | ||
// FIR_IDENTICAL | ||
// ALLOW_DANGEROUS_LANGUAGE_VERSION_TESTING | ||
// LANGUAGE_VERSION: 2.0 | ||
// API_VERSION: 2.0 | ||
|
||
@RequiresOptIn | ||
annotation class ApiMarker | ||
|
||
@<!OPT_IN_USAGE_ERROR!>SubclassOptInRequired<!>(ApiMarker::class) | ||
open class OpenKlass | ||
@<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, OPT_IN_USAGE_ERROR, UNRESOLVED_REFERENCE!>SubclassOptInRequired<!>(ApiMarker::class) | ||
open class OpenKlassA | ||
|
||
@OptIn(ExperimentalSubclassOptIn::class) | ||
@SubclassOptInRequired(ApiMarker::class) | ||
open class OpenKlassB |
1 change: 0 additions & 1 deletion
1
...a/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/IncorrectApplicability.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
// FIR_IDENTICAL | ||
@file:OptIn(ExperimentalSubclassOptIn::class) | ||
|
||
@RequiresOptIn | ||
annotation class ApiMarker | ||
|
1 change: 0 additions & 1 deletion
1
...nostics/testsWithStdLib/annotations/subclassOptInRequired/InheritingByLocalClassifiers.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
// FIR_IDENTICAL | ||
@file:OptIn(ExperimentalSubclassOptIn::class) | ||
|
||
@RequiresOptIn | ||
annotation class ApiMarker | ||
|
1 change: 0 additions & 1 deletion
1
...stics/testsWithStdLib/annotations/subclassOptInRequired/InheritingDifferentOptInLevels.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
// FIR_IDENTICAL | ||
@file:OptIn(ExperimentalSubclassOptIn::class) | ||
|
||
@RequiresOptIn | ||
annotation class ApiMarker | ||
|
1 change: 0 additions & 1 deletion
1
...ta/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InnerAndNestedClasses.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
// FIR_IDENTICAL | ||
@file:OptIn(ExperimentalSubclassOptIn::class) | ||
|
||
@RequiresOptIn | ||
annotation class Api | ||
|
1 change: 0 additions & 1 deletion
1
...er/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InnerClasses.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
// FIR_IDENTICAL | ||
@file:OptIn(ExperimentalSubclassOptIn::class) | ||
|
||
@RequiresOptIn | ||
annotation class Boom | ||
|
1 change: 0 additions & 1 deletion
1
compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Module.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
// FIR_IDENTICAL | ||
// MODULE: a | ||
@file:OptIn(ExperimentalSubclassOptIn::class) | ||
package a | ||
|
||
@RequiresOptIn | ||
|
1 change: 0 additions & 1 deletion
1
...r/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NestedClasses.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
// FIR_IDENTICAL | ||
@file:OptIn(ExperimentalSubclassOptIn::class) | ||
|
||
@RequiresOptIn | ||
annotation class Boom | ||
|
2 changes: 0 additions & 2 deletions
2
...agnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.fir.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 0 additions & 2 deletions
2
...a/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 0 additions & 2 deletions
2
...a/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/UsageOptInIsNotImplied.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,4 @@ | ||
// FIR_IDENTICAL | ||
@file:OptIn(ExperimentalSubclassOptIn::class) | ||
|
||
@RequiresOptIn | ||
annotation class ApiMarker | ||
|
||
|
2 changes: 0 additions & 2 deletions
2
...Data/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithAbstractClasses.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,4 @@ | ||
// FIR_IDENTICAL | ||
@file:OptIn(ExperimentalSubclassOptIn::class) | ||
|
||
@RequiresOptIn | ||
annotation class ApiMarker | ||
|
||
|
1 change: 0 additions & 1 deletion
1
...gnostics/testsWithStdLib/annotations/subclassOptInRequired/WithInheritanceByDelegation.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
// FIR_IDENTICAL | ||
@file:OptIn(ExperimentalSubclassOptIn::class) | ||
|
||
@RequiresOptIn | ||
annotation class ApiMarker | ||
|
2 changes: 0 additions & 2 deletions
2
.../testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithInterfaces.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,4 @@ | ||
// FIR_IDENTICAL | ||
@file:OptIn(ExperimentalSubclassOptIn::class) | ||
|
||
@RequiresOptIn | ||
annotation class ApiMarker | ||
|
||
|
2 changes: 0 additions & 2 deletions
2
...testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithOpenClasses.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,4 @@ | ||
// FIR_IDENTICAL | ||
@file:OptIn(ExperimentalSubclassOptIn::class) | ||
|
||
@RequiresOptIn | ||
annotation class ApiMarker | ||
|
||
|