diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java index 5820f8f205b..f8c56211af4 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java @@ -11179,6 +11179,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguityOn.kt"); } + @Test + @TestMetadata("javaFakeEnumEntries.kt") + public void testJavaFakeEnumEntries() throws Exception { + runTest("compiler/testData/diagnostics/tests/enum/entries/javaFakeEnumEntries.kt"); + } + @Test @TestMetadata("nameShadowingOfExternallyDefinedEntries.kt") public void testNameShadowingOfExternallyDefinedEntries() throws Exception { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java index a3c7d6f96d5..9fca61b177e 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java @@ -11179,6 +11179,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguityOn.kt"); } + @Test + @TestMetadata("javaFakeEnumEntries.kt") + public void testJavaFakeEnumEntries() throws Exception { + runTest("compiler/testData/diagnostics/tests/enum/entries/javaFakeEnumEntries.kt"); + } + @Test @TestMetadata("nameShadowingOfExternallyDefinedEntries.kt") public void testNameShadowingOfExternallyDefinedEntries() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java index 4809c75e730..1dec0524e4a 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java @@ -11179,6 +11179,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguityOn.kt"); } + @Test + @TestMetadata("javaFakeEnumEntries.kt") + public void testJavaFakeEnumEntries() throws Exception { + runTest("compiler/testData/diagnostics/tests/enum/entries/javaFakeEnumEntries.kt"); + } + @Test @TestMetadata("nameShadowingOfExternallyDefinedEntries.kt") public void testNameShadowingOfExternallyDefinedEntries() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java index ab91c509e63..ad28894688c 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java @@ -11185,6 +11185,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguityOn.kt"); } + @Test + @TestMetadata("javaFakeEnumEntries.kt") + public void testJavaFakeEnumEntries() throws Exception { + runTest("compiler/testData/diagnostics/tests/enum/entries/javaFakeEnumEntries.kt"); + } + @Test @TestMetadata("nameShadowingOfExternallyDefinedEntries.kt") public void testNameShadowingOfExternallyDefinedEntries() throws Exception { diff --git a/compiler/testData/diagnostics/tests/enum/entries/javaFakeEnumEntries.fir.txt b/compiler/testData/diagnostics/tests/enum/entries/javaFakeEnumEntries.fir.txt new file mode 100644 index 00000000000..44730564d41 --- /dev/null +++ b/compiler/testData/diagnostics/tests/enum/entries/javaFakeEnumEntries.fir.txt @@ -0,0 +1,9 @@ +FILE: test.kt + public final val entries: R|kotlin/Int| = Int(0) + public get(): R|kotlin/Int| + public final val somethingElse: R|kotlin/Int| = Int(1) + public get(): R|kotlin/Int| + public final fun test(): R|kotlin/Unit| { + R|pkg/JEnumStaticField.entries*s|.R|kotlin/String.length| + R|pkg/JEnumStaticField.somethingElse*s|.R|kotlin/String.length| + } diff --git a/compiler/testData/diagnostics/tests/enum/entries/javaFakeEnumEntries.kt b/compiler/testData/diagnostics/tests/enum/entries/javaFakeEnumEntries.kt new file mode 100644 index 00000000000..14044b8650d --- /dev/null +++ b/compiler/testData/diagnostics/tests/enum/entries/javaFakeEnumEntries.kt @@ -0,0 +1,28 @@ +// FIR_IDENTICAL +// !LANGUAGE: +EnumEntries -PrioritizedEnumEntries +// WITH_STDLIB +// FIR_DUMP + +// FILE: pkg/JEnumStaticField.java + +package pkg; + +public enum JEnumStaticField { + ; + + public static final String entries = "ENTRIES"; + public static final String somethingElse = "..."; +} + +// FILE: test.kt + +import pkg.JEnumStaticField.entries +import pkg.JEnumStaticField.somethingElse + +val entries = 0 +val somethingElse = 1 + +fun test() { + entries.length + somethingElse.length +} 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 93feec612cf..26696a55094 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 @@ -11185,6 +11185,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/enum/entries/javaEnumEntriesAmbiguityOn.kt"); } + @Test + @TestMetadata("javaFakeEnumEntries.kt") + public void testJavaFakeEnumEntries() throws Exception { + runTest("compiler/testData/diagnostics/tests/enum/entries/javaFakeEnumEntries.kt"); + } + @Test @TestMetadata("nameShadowingOfExternallyDefinedEntries.kt") public void testNameShadowingOfExternallyDefinedEntries() throws Exception {