From c534c54a1c306654749a0ab20717e03e4cd3d2f3 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 19 Jan 2023 11:57:26 +0100 Subject: [PATCH] FE: use WITH_STDLIB directive for Enum.entries tests --- .../entries/conflictingPropertyEntriesAndReference.fir.kt | 7 ++++--- .../enum/entries/conflictingPropertyEntriesAndReference.kt | 1 + .../entries/conflictingPropertyEntriesAndReference.txt | 1 + .../enum/entries/entriesPropertyAsExtensionClash.fir.kt | 3 ++- .../tests/enum/entries/entriesPropertyAsExtensionClash.kt | 1 + .../tests/enum/entries/entriesPropertyAsExtensionClash.txt | 1 + .../tests/enum/entries/entriesPropertyImportedClash.fir.kt | 3 ++- .../tests/enum/entries/entriesPropertyImportedClash.kt | 1 + .../tests/enum/entries/entriesPropertyImportedClash.txt | 1 + .../enum/entries/entriesPropertyInCompanionClash.fir.kt | 3 ++- .../tests/enum/entries/entriesPropertyInCompanionClash.kt | 1 + .../tests/enum/entries/entriesPropertyInCompanionClash.txt | 1 + .../tests/enum/entries/enumEntriesAmbiguity.fir.kt | 1 + .../diagnostics/tests/enum/entries/enumEntriesAmbiguity.kt | 1 + .../tests/enum/entries/enumEntriesAmbiguity.txt | 1 + .../tests/enum/entries/genericEntriesPropertyClash.fir.kt | 3 ++- .../tests/enum/entries/genericEntriesPropertyClash.kt | 1 + .../tests/enum/entries/genericEntriesPropertyClash.txt | 1 + .../tests/enum/entries/javaEnumEntriesAmbiguity.fir.kt | 3 ++- .../tests/enum/entries/javaEnumEntriesAmbiguity.kt | 1 + .../tests/enum/entries/javaEnumEntriesAmbiguity.txt | 3 +++ .../entries/nameShadowingOfExternallyDefinedEntries.fir.kt | 5 +++-- .../entries/nameShadowingOfExternallyDefinedEntries.kt | 1 + .../entries/nameShadowingOfExternallyDefinedEntries.txt | 2 ++ .../redeclarationOfEnumEntriesNameWithIntrinsic.fir.kt | 1 + .../entries/redeclarationOfEnumEntriesNameWithIntrinsic.kt | 1 + .../redeclarationOfEnumEntriesNameWithIntrinsic.txt | 1 + 27 files changed, 40 insertions(+), 10 deletions(-) diff --git a/compiler/testData/diagnostics/tests/enum/entries/conflictingPropertyEntriesAndReference.fir.kt b/compiler/testData/diagnostics/tests/enum/entries/conflictingPropertyEntriesAndReference.fir.kt index 3bd620c7a9f..662126e9366 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/conflictingPropertyEntriesAndReference.fir.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/conflictingPropertyEntriesAndReference.fir.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -EnumEntries +// WITH_STDLIB enum class E { ; @@ -7,8 +8,8 @@ enum class E { } fun test() { - E::entries - val ref = E::entries + E::entries + val ref = E::entries val refType: (E) -> Int = E::entries - val refTypeWithAnyExpectedType: Any = E::entries + val refTypeWithAnyExpectedType: Any = E::entries } diff --git a/compiler/testData/diagnostics/tests/enum/entries/conflictingPropertyEntriesAndReference.kt b/compiler/testData/diagnostics/tests/enum/entries/conflictingPropertyEntriesAndReference.kt index 9cdaf0266d3..bc93b95143a 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/conflictingPropertyEntriesAndReference.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/conflictingPropertyEntriesAndReference.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -EnumEntries +// WITH_STDLIB enum class E { ; diff --git a/compiler/testData/diagnostics/tests/enum/entries/conflictingPropertyEntriesAndReference.txt b/compiler/testData/diagnostics/tests/enum/entries/conflictingPropertyEntriesAndReference.txt index a7d2a5a0fa5..3b95878fa15 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/conflictingPropertyEntriesAndReference.txt +++ b/compiler/testData/diagnostics/tests/enum/entries/conflictingPropertyEntriesAndReference.txt @@ -16,6 +16,7 @@ public final enum class E : kotlin.Enum { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members + public final /*synthesized*/ val entries: kotlin.enums.EnumEntries public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E public final /*synthesized*/ fun values(): kotlin.Array } diff --git a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClash.fir.kt b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClash.fir.kt index dee3cf9673f..6f649ae1acb 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClash.fir.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClash.fir.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -EnumEntries +// WITH_STDLIB package pckg @@ -11,7 +12,7 @@ enum class A { val A.Companion.entries: Int get() = 0 fun test() { - A.entries + A.entries A.Companion.entries with(A) { diff --git a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClash.kt b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClash.kt index 583d075e0b1..5f14bc9532b 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClash.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClash.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -EnumEntries +// WITH_STDLIB package pckg diff --git a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClash.txt b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClash.txt index 3efedb749a5..3df66f96b7d 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClash.txt +++ b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyAsExtensionClash.txt @@ -24,6 +24,7 @@ package pckg { } // Static members + public final /*synthesized*/ val entries: kotlin.enums.EnumEntries public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): pckg.A public final /*synthesized*/ fun values(): kotlin.Array } diff --git a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImportedClash.fir.kt b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImportedClash.fir.kt index aeb4220ac83..715635124fb 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImportedClash.fir.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImportedClash.fir.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -EnumEntries +// WITH_STDLIB package foo @@ -13,7 +14,7 @@ enum class A { } fun test() { - A.entries + A.entries with(A) { entries diff --git a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImportedClash.kt b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImportedClash.kt index 030e195cb14..6cd6e9623d7 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImportedClash.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImportedClash.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -EnumEntries +// WITH_STDLIB package foo diff --git a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImportedClash.txt b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImportedClash.txt index ff2a24b0450..a791f876d40 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImportedClash.txt +++ b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyImportedClash.txt @@ -24,6 +24,7 @@ package foo { } // Static members + public final /*synthesized*/ val entries: kotlin.enums.EnumEntries public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): foo.A public final /*synthesized*/ fun values(): kotlin.Array } diff --git a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyInCompanionClash.fir.kt b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyInCompanionClash.fir.kt index b2651e2d518..bd625d588c6 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyInCompanionClash.fir.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyInCompanionClash.fir.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -EnumEntries +// WITH_STDLIB enum class A { ; @@ -9,7 +10,7 @@ enum class A { } fun test() { - A.entries + A.entries A.Companion.entries with(A) { diff --git a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyInCompanionClash.kt b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyInCompanionClash.kt index 6f395405e0b..d561efbfac8 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyInCompanionClash.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyInCompanionClash.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -EnumEntries +// WITH_STDLIB enum class A { ; diff --git a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyInCompanionClash.txt b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyInCompanionClash.txt index 11a7c0bc0b0..75d73c2d3e7 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyInCompanionClash.txt +++ b/compiler/testData/diagnostics/tests/enum/entries/entriesPropertyInCompanionClash.txt @@ -23,6 +23,7 @@ public final enum class A : kotlin.Enum { } // Static members + public final /*synthesized*/ val entries: kotlin.enums.EnumEntries public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A public final /*synthesized*/ fun values(): kotlin.Array } diff --git a/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.fir.kt b/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.fir.kt index 357e3c82601..7f8b3c3a87a 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.fir.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.fir.kt @@ -1,4 +1,5 @@ // !LANGUAGE: +EnumEntries +// WITH_STDLIB // FIR_DUMP enum class Ambiguous { diff --git a/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.kt b/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.kt index ece7556d888..c607c83174a 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.kt @@ -1,4 +1,5 @@ // !LANGUAGE: +EnumEntries +// WITH_STDLIB // FIR_DUMP enum class Ambiguous { diff --git a/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.txt b/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.txt index 6d279372a10..61b0b236d01 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.txt +++ b/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.txt @@ -19,6 +19,7 @@ public final enum class Ambiguous : kotlin.Enum { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members + public final /*synthesized*/ val entries: kotlin.enums.EnumEntries public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Ambiguous public final /*synthesized*/ fun values(): kotlin.Array } diff --git a/compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.fir.kt b/compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.fir.kt index 721aad99138..805559d1fe4 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.fir.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.fir.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -EnumEntries +// WITH_STDLIB package pckg @@ -11,6 +12,6 @@ enum class A { val T.entries: Int get() = 0 fun test() { - A.entries + A.entries A.Companion.entries } diff --git a/compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.kt b/compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.kt index 088f81f2192..54000f55666 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -EnumEntries +// WITH_STDLIB package pckg diff --git a/compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.txt b/compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.txt index 6746c72b36e..5f452993c2a 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.txt +++ b/compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.txt @@ -24,6 +24,7 @@ package pckg { } // Static members + public final /*synthesized*/ val entries: kotlin.enums.EnumEntries public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): pckg.A public final /*synthesized*/ fun values(): kotlin.Array } diff --git a/compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguity.fir.kt b/compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguity.fir.kt index 325b8ba9c73..321b41e71fc 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguity.fir.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguity.fir.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -EnumEntries +// WITH_STDLIB // FILE: JEnumEntry.java @@ -28,5 +29,5 @@ fun test() { JEnumEntry.entries JEnumStaticField.entries - JEnumField::entries + JEnumField::entries } diff --git a/compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguity.kt b/compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguity.kt index c355d1e375d..e12360c1683 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguity.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguity.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -EnumEntries +// WITH_STDLIB // FILE: JEnumEntry.java diff --git a/compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguity.txt b/compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguity.txt index 6cac591c564..bc1faa81dd8 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguity.txt +++ b/compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguity.txt @@ -17,6 +17,7 @@ public final enum class JEnumEntry : kotlin.Enum { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members + public final /*synthesized*/ val entries: kotlin.enums.EnumEntries public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): JEnumEntry public final /*synthesized*/ fun values(): kotlin.Array } @@ -35,6 +36,7 @@ public final enum class JEnumField : kotlin.Enum { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members + public final /*synthesized*/ val entries: kotlin.enums.EnumEntries public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): JEnumField public final /*synthesized*/ fun values(): kotlin.Array } @@ -53,6 +55,7 @@ public final enum class JEnumStaticField : kotlin.Enum { // Static members public const final val entries: kotlin.Int = 0 + public final /*synthesized*/ val entries: kotlin.enums.EnumEntries public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): JEnumStaticField public final /*synthesized*/ fun values(): kotlin.Array } diff --git a/compiler/testData/diagnostics/tests/enum/entries/nameShadowingOfExternallyDefinedEntries.fir.kt b/compiler/testData/diagnostics/tests/enum/entries/nameShadowingOfExternallyDefinedEntries.fir.kt index 0d0d7644310..c57ea630636 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/nameShadowingOfExternallyDefinedEntries.fir.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/nameShadowingOfExternallyDefinedEntries.fir.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -EnumEntries +// WITH_STDLIB package pckg @@ -8,7 +9,7 @@ enum class E { ; fun foo() { - entries + entries pckg.entries } } @@ -19,7 +20,7 @@ class A { class B { fun foo() { - entries + entries pckg.entries } } diff --git a/compiler/testData/diagnostics/tests/enum/entries/nameShadowingOfExternallyDefinedEntries.kt b/compiler/testData/diagnostics/tests/enum/entries/nameShadowingOfExternallyDefinedEntries.kt index 5117f9b4dcf..c50da83273a 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/nameShadowingOfExternallyDefinedEntries.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/nameShadowingOfExternallyDefinedEntries.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -EnumEntries +// WITH_STDLIB package pckg diff --git a/compiler/testData/diagnostics/tests/enum/entries/nameShadowingOfExternallyDefinedEntries.txt b/compiler/testData/diagnostics/tests/enum/entries/nameShadowingOfExternallyDefinedEntries.txt index e39fe5ff58f..b753e66ed53 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/nameShadowingOfExternallyDefinedEntries.txt +++ b/compiler/testData/diagnostics/tests/enum/entries/nameShadowingOfExternallyDefinedEntries.txt @@ -39,6 +39,7 @@ package pckg { } // Static members + public final /*synthesized*/ val entries: kotlin.enums.EnumEntries public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): pckg.A.E public final /*synthesized*/ fun values(): kotlin.Array } @@ -58,6 +59,7 @@ package pckg { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members + public final /*synthesized*/ val entries: kotlin.enums.EnumEntries public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): pckg.E public final /*synthesized*/ fun values(): kotlin.Array } diff --git a/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.fir.kt b/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.fir.kt index a1e728ca849..4014ad1d4c4 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.fir.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.fir.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -EnumEntries +// WITH_STDLIB enum class E { entries, Entries; diff --git a/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.kt b/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.kt index 80c0f193d0e..e1a969ed55a 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.kt @@ -1,4 +1,5 @@ // !LANGUAGE: -EnumEntries +// WITH_STDLIB enum class E { entries, Entries; diff --git a/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.txt b/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.txt index bb50baad914..3989bd1962c 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.txt +++ b/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.txt @@ -18,6 +18,7 @@ public final enum class E : kotlin.Enum { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members + public final /*synthesized*/ val entries: kotlin.enums.EnumEntries public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E public final /*synthesized*/ fun values(): kotlin.Array }