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

K2: don't report REDECLARATION on Enum.entries

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-08-16 16:45:38 +02:00
committed by Space
parent 730de8fd7c
commit 68ca453467
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirDeclarationInspector.kt
+1
View File
@@ -233,6 +233,7 @@ private val NO_NAME_PROVIDED = Name.special("<no name provided>")
// you can't redeclare something that has no name. // you can't redeclare something that has no name.
private fun FirDeclaration.isCollectable() = when (this) { private fun FirDeclaration.isCollectable() = when (this) {
is FirSimpleFunction -> source?.kind !is KtFakeSourceElementKind && name != NO_NAME_PROVIDED is FirSimpleFunction -> source?.kind !is KtFakeSourceElementKind && name != NO_NAME_PROVIDED
is FirProperty -> source?.kind !is KtFakeSourceElementKind.EnumGeneratedDeclaration
is FirRegularClass -> name != NO_NAME_PROVIDED is FirRegularClass -> name != NO_NAME_PROVIDED
else -> true else -> true
} }
compiler/testData/diagnostics/tests/enum/enumEntriesAmbiguity.fir.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
// !LANGUAGE: +EnumEntries // !LANGUAGE: +EnumEntries
// FIR_DUMP // FIR_DUMP
enum class <!REDECLARATION!>Ambiguous<!> { enum class Ambiguous {
first, <!REDECLARATION!>entries<!>; first, entries;
} }
val e = Ambiguous.<!OVERLOAD_RESOLUTION_AMBIGUITY!>entries<!> val e = Ambiguous.<!OVERLOAD_RESOLUTION_AMBIGUITY!>entries<!>