azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stabilize EnumEntries stdlib signature

Browse Source 
* Also, mention implementation details of EnumEntries to enable safe uses of a 'EnumEntries' as a set
* Fix testdata for opt-in marker in enum entries

^KT-58548 fixed

Merge-request: KT-MR-10037
Merged-by: Vsevolod Tolstopyatov <qwwdfsad@gmail.com>
This commit is contained in:
Vsevolod Tolstopyatov
2023-05-11 09:18:44 +00:00
committed by Space Team
parent aec78ab2d8
commit 5b474bc5d3
17 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/enum/entries/conflictingPropertyEntriesAndReference.fir.kt
Vendored
+3 -3
View File
@@ -8,8 +8,8 @@ enum class E {
}
fun test() {
E::<!OPT_IN_USAGE_ERROR!>entries<!>
val ref = E::<!OPT_IN_USAGE_ERROR!>entries<!>
E::entries
val ref = E::entries
val refType: (E) -> Int = E::entries
val refTypeWithAnyExpectedType: Any = E::<!OPT_IN_USAGE_ERROR!>entries<!>
val refTypeWithAnyExpectedType: Any = E::entries
}
compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClash.fir.kt
Vendored
+2 -2
View File
@@ -12,7 +12,7 @@ enum class A {
val A.Companion.entries: Int get() = 0
fun test() {
A.<!OPT_IN_USAGE_ERROR!>entries<!>
A.entries
A.Companion.entries
with(A) {
@@ -26,4 +26,4 @@ fun test() {
val aCompanion = A.Companion
aCompanion.entries
}
}
compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClashOn.fir.kt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ enum class A {
val A.Companion.entries: Int get() = 0
fun test() {
A.<!OPT_IN_USAGE_ERROR!>entries<!>
A.entries
A.Companion.entries
with(A) {
compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImportedClash.fir.kt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ enum class A {
}
fun test() {
A.<!OPT_IN_USAGE_ERROR!>entries<!>
A.entries
with(A) {
entries
compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImportedClashOn.fir.kt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ enum class A {
}
fun test() {
A.<!OPT_IN_USAGE_ERROR!>entries<!>
A.entries
with(A) {
entries
compiler/testData/diagnostics/tests/enum/entries/entriesPropertyInCompanionClash.fir.kt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ enum class A {
}
fun test() {
A.<!OPT_IN_USAGE_ERROR!>entries<!>
A.entries
A.Companion.entries
with(A) {
compiler/testData/diagnostics/tests/enum/entries/entriesPropertyInCompanionClashOn.fir.kt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ enum class A {
}
fun test() {
A.<!OPT_IN_USAGE_ERROR!>entries<!>
A.entries
A.Companion.entries
with(A) {
compiler/testData/diagnostics/tests/enum/entries/entriesPropertyWithJvmStaticClash.fir.kt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ enum class A {
}
fun test() {
A.<!OPT_IN_USAGE_ERROR!>entries<!>
A.entries
with(A) {
entries
compiler/testData/diagnostics/tests/enum/entries/entriesUnsupported.fir.kt
Vendored
+1 -1
View File
@@ -7,5 +7,5 @@ enum class Foo {
}
fun main() {
Foo.<!OPT_IN_USAGE_ERROR!>entries<!>
Foo.entries
}
compiler/testData/diagnostics/tests/enum/entries/entriesUnsupported.kt
Vendored
+1 -1
View File
@@ -7,5 +7,5 @@ enum class Foo {
}
fun main() {
Foo.<!OPT_IN_USAGE_ERROR, UNSUPPORTED_FEATURE!>entries<!>
Foo.<!UNSUPPORTED_FEATURE!>entries<!>
}
compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.fir.kt
Vendored
+1 -1
View File
@@ -12,6 +12,6 @@ enum class A {
val <T> T.entries: Int get() = 0
fun test() {
A.<!OPT_IN_USAGE_ERROR!>entries<!>
A.entries
A.Companion.entries
}
compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguity.fir.kt
Vendored
+1 -1
View File
@@ -29,5 +29,5 @@ fun test() {
JEnumEntry.entries
JEnumStaticField.entries
JEnumField::<!OPT_IN_USAGE_ERROR!>entries<!>
JEnumField::entries
}
compiler/testData/diagnostics/tests/enum/entries/nameShadowingOfExternallyDefinedEntries.fir.kt
Vendored
+2 -2
View File
@@ -9,7 +9,7 @@ enum class E {
;
fun foo() {
<!OPT_IN_USAGE_ERROR!>entries<!>
entries
pckg.entries
}
}
@@ -20,7 +20,7 @@ class A {
class B {
fun foo() {
<!OPT_IN_USAGE_ERROR!>entries<!>
entries
pckg.entries
}
}
compiler/testData/diagnostics/tests/enum/entries/nameShadowingOfExternallyDefinedEntriesOn.fir.kt
Vendored
+2 -2
View File
@@ -9,7 +9,7 @@ enum class E {
;
fun foo() {
<!OPT_IN_USAGE_ERROR!>entries<!>.<!UNRESOLVED_REFERENCE!>length<!>
entries.<!UNRESOLVED_REFERENCE!>length<!>
pckg.entries.length
}
}
@@ -20,7 +20,7 @@ class A {
class B {
fun foo() {
<!OPT_IN_USAGE_ERROR!>entries<!>.<!UNRESOLVED_REFERENCE!>length<!>
entries.<!UNRESOLVED_REFERENCE!>length<!>
pckg.entries.length
}
}