From c70a1b18847d8f44a68eb14fb83636620bd16509 Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Mon, 2 Jan 2023 14:25:54 +0100 Subject: [PATCH] Add a warning for a custom `Enum.entries` entry ^KT-53153 --- ...CompilerTestFE10TestdataTestGenerated.java | 6 +++++ ...irOldFrontendDiagnosticsTestGenerated.java | 6 +++++ ...DiagnosticsWithLightTreeTestGenerated.java | 6 +++++ .../jetbrains/kotlin/diagnostics/Errors.java | 1 + .../rendering/DefaultErrorMessages.java | 1 + .../resolve/PlatformConfiguratorBase.kt | 1 + .../EnumEntriesRedeclarationChecker.kt | 20 ++++++++++++++++ .../enum/entries/enumEntriesAmbiguity.fir.kt | 8 +++++++ .../enum/entries/enumEntriesAmbiguity.fir.txt | 2 +- .../enum/entries/enumEntriesAmbiguity.kt | 3 +-- ...ationOfEnumEntriesNameWithIntrinsic.fir.kt | 10 ++++++++ ...clarationOfEnumEntriesNameWithIntrinsic.kt | 10 ++++++++ ...larationOfEnumEntriesNameWithIntrinsic.txt | 23 +++++++++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 +++++ 14 files changed, 100 insertions(+), 3 deletions(-) create mode 100644 compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/EnumEntriesRedeclarationChecker.kt create mode 100644 compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.fir.kt create mode 100644 compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.fir.kt create mode 100644 compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.kt create mode 100644 compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.txt diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java index cb45ecc107e..580dfddddb3 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java @@ -10354,6 +10354,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag public void testGenericEntriesPropertyClash() throws Exception { runTest("compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.kt"); } + + @Test + @TestMetadata("redeclarationOfEnumEntriesNameWithIntrinsic.kt") + public void testRedeclarationOfEnumEntriesNameWithIntrinsic() throws Exception { + runTest("compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.kt"); + } } @Nested diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java index e45c7518654..ff195d49b5b 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java @@ -10360,6 +10360,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti public void testGenericEntriesPropertyClash() throws Exception { runTest("compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.kt"); } + + @Test + @TestMetadata("redeclarationOfEnumEntriesNameWithIntrinsic.kt") + public void testRedeclarationOfEnumEntriesNameWithIntrinsic() throws Exception { + runTest("compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.kt"); + } } @Nested diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java index 43aacdd0e60..b056755ecc9 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java @@ -10354,6 +10354,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac public void testGenericEntriesPropertyClash() throws Exception { runTest("compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.kt"); } + + @Test + @TestMetadata("redeclarationOfEnumEntriesNameWithIntrinsic.kt") + public void testRedeclarationOfEnumEntriesNameWithIntrinsic() throws Exception { + runTest("compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.kt"); + } } @Nested diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java index e207ee0bdc4..64a3ed016c8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java @@ -143,6 +143,7 @@ public interface Errors { DiagnosticFactory1 DEPRECATED_ACCESS_TO_ENUM_COMPANION_PROPERTY = DiagnosticFactory1.create(WARNING); DiagnosticFactory0 DEPRECATED_ACCESS_TO_ENUM_ENTRY_COMPANION_PROPERTY = DiagnosticFactory0.create(WARNING); + DiagnosticFactory0 DEPRECATED_DECLARATION_OF_ENUM_ENTRY = DiagnosticFactory0.create(WARNING); DiagnosticFactory2 DEPRECATED_RESOLVE_WITH_AMBIGUOUS_ENUM_ENTRY = DiagnosticFactory2.create(WARNING); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java index bad48decd91..a6596e123ae 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java @@ -74,6 +74,7 @@ public class DefaultErrorMessages { MAP.put(DEPRECATED_ACCESS_BY_SHORT_NAME, "Access to this type by short name is deprecated, and soon is going to be removed. Please, add explicit qualifier or import", NAME); MAP.put(DEPRECATED_ACCESS_TO_ENUM_COMPANION_PROPERTY, "Ambiguous access to companion''s property ''{0}'' in enum is deprecated. Please, add explicit Companion qualifier to the class name", NAME); MAP.put(DEPRECATED_ACCESS_TO_ENUM_ENTRY_COMPANION_PROPERTY, "Ambiguous access to companion''s property 'entries' in enum is deprecated. Please, add explicit Companion qualifier to the class name"); + MAP.put(DEPRECATED_DECLARATION_OF_ENUM_ENTRY, "Conflicting declarations: enum entry 'entries' and the property 'Enum.entries' (KT-48872). Please, rename the enum entry declaration"); MAP.put(DEPRECATED_RESOLVE_WITH_AMBIGUOUS_ENUM_ENTRY, "Ambiguous access to property ''{0}'' is deprecated because similar enum entry ''{1}'' is available. Please add explicit named import or use fully qualified name", FQ_NAME, FQ_NAME); MAP.put(PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL, "Protected constructor ''{0}'' from other classes can only be used in super-call", Renderers.SHORT_NAMES_IN_TYPES); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/PlatformConfiguratorBase.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/PlatformConfiguratorBase.kt index efc8df86de5..98605b29532 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/PlatformConfiguratorBase.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/PlatformConfiguratorBase.kt @@ -54,6 +54,7 @@ private val DEFAULT_DECLARATION_CHECKERS = listOf( CyclicAnnotationsChecker, UnsupportedUntilRangeDeclarationChecker, DataObjectContentChecker, + EnumEntriesRedeclarationChecker, ) private val DEFAULT_CALL_CHECKERS = listOf( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/EnumEntriesRedeclarationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/EnumEntriesRedeclarationChecker.kt new file mode 100644 index 00000000000..1f88250fe91 --- /dev/null +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/EnumEntriesRedeclarationChecker.kt @@ -0,0 +1,20 @@ +/* + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.resolve.checkers + +import org.jetbrains.kotlin.builtins.StandardNames +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.diagnostics.Errors +import org.jetbrains.kotlin.psi.KtDeclaration +import org.jetbrains.kotlin.psi.KtEnumEntry + +object EnumEntriesRedeclarationChecker : DeclarationChecker { + override fun check(declaration: KtDeclaration, descriptor: DeclarationDescriptor, context: DeclarationCheckerContext) { + if (declaration !is KtEnumEntry || declaration.name != StandardNames.ENUM_ENTRIES.asString()) return + + context.trace.report(Errors.DEPRECATED_DECLARATION_OF_ENUM_ENTRY.on(declaration)) + } +} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.fir.kt b/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.fir.kt new file mode 100644 index 00000000000..357e3c82601 --- /dev/null +++ b/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.fir.kt @@ -0,0 +1,8 @@ +// !LANGUAGE: +EnumEntries +// FIR_DUMP + +enum class Ambiguous { + first, entries; +} + +val e = Ambiguous.entries diff --git a/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.fir.txt b/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.fir.txt index 7a448a4c208..a3612592e89 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.fir.txt +++ b/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.fir.txt @@ -1,4 +1,4 @@ -FILE: enumEntriesAmbiguity.kt +FILE: enumEntriesAmbiguity.fir.kt public final enum class Ambiguous : R|kotlin/Enum| { private constructor(): R|Ambiguous| { super|>() diff --git a/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.kt b/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.kt index c1aa3eb8338..ece7556d888 100644 --- a/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.kt +++ b/compiler/testData/diagnostics/tests/enum/entries/enumEntriesAmbiguity.kt @@ -1,9 +1,8 @@ -// FIR_IDENTICAL // !LANGUAGE: +EnumEntries // FIR_DUMP enum class Ambiguous { - first, entries; + first, entries; } val e = Ambiguous.entries diff --git a/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.fir.kt b/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.fir.kt new file mode 100644 index 00000000000..a1e728ca849 --- /dev/null +++ b/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.fir.kt @@ -0,0 +1,10 @@ +// !LANGUAGE: -EnumEntries + +enum class E { + entries, Entries; + + fun foo() { + entries + E.entries + } +} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.kt b/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.kt new file mode 100644 index 00000000000..80c0f193d0e --- /dev/null +++ b/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.kt @@ -0,0 +1,10 @@ +// !LANGUAGE: -EnumEntries + +enum class E { + entries, Entries; + + fun foo() { + entries + E.entries + } +} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.txt b/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.txt new file mode 100644 index 00000000000..bb50baad914 --- /dev/null +++ b/compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.txt @@ -0,0 +1,23 @@ +package + +public final enum class E : kotlin.Enum { + enum entry entries + + enum entry Entries + + private constructor E() + @kotlin.internal.IntrinsicConstEvaluation public final override /*1*/ /*fake_override*/ val name: kotlin.String + public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int + protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any + public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int + public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final fun foo(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! + public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String + + // Static members + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E + public final /*synthesized*/ fun values(): kotlin.Array +} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java index 676d1e9df88..5054e7544bf 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java @@ -10360,6 +10360,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { public void testGenericEntriesPropertyClash() throws Exception { runTest("compiler/testData/diagnostics/tests/enum/entries/genericEntriesPropertyClash.kt"); } + + @Test + @TestMetadata("redeclarationOfEnumEntriesNameWithIntrinsic.kt") + public void testRedeclarationOfEnumEntriesNameWithIntrinsic() throws Exception { + runTest("compiler/testData/diagnostics/tests/enum/entries/redeclarationOfEnumEntriesNameWithIntrinsic.kt"); + } } @Nested