From 68ca453467b59743d3cd1499af92cbb1dc0d6ff0 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 16 Aug 2022 16:45:38 +0200 Subject: [PATCH] K2: don't report REDECLARATION on Enum.entries --- .../kotlin/fir/analysis/checkers/FirDeclarationInspector.kt | 1 + .../diagnostics/tests/enum/enumEntriesAmbiguity.fir.kt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirDeclarationInspector.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirDeclarationInspector.kt index 51f7df8b52c..be1b5b36ec1 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirDeclarationInspector.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirDeclarationInspector.kt @@ -233,6 +233,7 @@ private val NO_NAME_PROVIDED = Name.special("") // you can't redeclare something that has no name. private fun FirDeclaration.isCollectable() = when (this) { is FirSimpleFunction -> source?.kind !is KtFakeSourceElementKind && name != NO_NAME_PROVIDED + is FirProperty -> source?.kind !is KtFakeSourceElementKind.EnumGeneratedDeclaration is FirRegularClass -> name != NO_NAME_PROVIDED else -> true } diff --git a/compiler/testData/diagnostics/tests/enum/enumEntriesAmbiguity.fir.kt b/compiler/testData/diagnostics/tests/enum/enumEntriesAmbiguity.fir.kt index 5666e2e2dd2..e7e05da76f6 100644 --- a/compiler/testData/diagnostics/tests/enum/enumEntriesAmbiguity.fir.kt +++ b/compiler/testData/diagnostics/tests/enum/enumEntriesAmbiguity.fir.kt @@ -1,8 +1,8 @@ // !LANGUAGE: +EnumEntries // FIR_DUMP -enum class Ambiguous { - first, entries; +enum class Ambiguous { + first, entries; } val e = Ambiguous.entries