From 7a0d1ce0d1874d349a4ed7e736a77ea06d50a435 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 20 Jan 2022 15:59:34 +0100 Subject: [PATCH] LL API: consider enum entries as structure elements --- .../FileStructureElementDiagnosticRetriever.kt | 2 +- .../low-level-api-fir/testdata/fileStructure/enumClass.kt | 8 ++++---- .../testdata/fileStructure/enumClassWithBody.kt | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticRetriever.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticRetriever.kt index 328f1f5da33..88241a82b1b 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticRetriever.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticRetriever.kt @@ -68,7 +68,7 @@ internal class SingleNonLocalDeclarationDiagnosticRetriever( if (shouldDiagnosticsAlwaysBeCheckedOn(this)) return true return when (this) { is FirAnonymousInitializer -> true - is FirEnumEntry -> true + is FirEnumEntry -> false is FirValueParameter -> true is FirConstructor -> isPrimary else -> false diff --git a/analysis/low-level-api-fir/testdata/fileStructure/enumClass.kt b/analysis/low-level-api-fir/testdata/fileStructure/enumClass.kt index 9d56482d170..7c6b44ec80a 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/enumClass.kt +++ b/analysis/low-level-api-fir/testdata/fileStructure/enumClass.kt @@ -1,13 +1,13 @@ enum class A {/* NonReanalyzableDeclarationStructureElement */ - X, - Y, + X,/* NonReanalyzableDeclarationStructureElement */ + Y,/* NonReanalyzableDeclarationStructureElement */ Z - ; + ;/* NonReanalyzableDeclarationStructureElement */ fun foo(){/* ReanalyzableFunctionStructureElement */} val x = 10/* NonReanalyzableDeclarationStructureElement */ fun bar() = 10/* NonReanalyzableDeclarationStructureElement */ -} \ No newline at end of file +} diff --git a/analysis/low-level-api-fir/testdata/fileStructure/enumClassWithBody.kt b/analysis/low-level-api-fir/testdata/fileStructure/enumClassWithBody.kt index 0fcad0b00cb..0c9907cb78b 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/enumClassWithBody.kt +++ b/analysis/low-level-api-fir/testdata/fileStructure/enumClassWithBody.kt @@ -1,13 +1,13 @@ enum class A {/* NonReanalyzableDeclarationStructureElement */ - X { + X {/* NonReanalyzableDeclarationStructureElement */ fun localInX() = 1 }, - Y { + Y {/* NonReanalyzableDeclarationStructureElement */ override fun foo() {} }, Z, - ; + ;/* NonReanalyzableDeclarationStructureElement */ open fun foo() {/* ReanalyzableFunctionStructureElement */} -} \ No newline at end of file +}