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 2056dff67e4..ff60bda04c3 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 @@ -44797,6 +44797,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase.kt"); } + @Test + @TestMetadata("qualifierEnumEntryOrCompanionMemberCase2.kt") + public void testQualifierEnumEntryOrCompanionMemberCase2() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase2.kt"); + } + @Test @TestMetadata("qualifierForStaticCase.kt") public void testQualifierForStaticCase() 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 82135545e90..0b812e9982c 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 @@ -44797,6 +44797,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase.kt"); } + @Test + @TestMetadata("qualifierEnumEntryOrCompanionMemberCase2.kt") + public void testQualifierEnumEntryOrCompanionMemberCase2() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase2.kt"); + } + @Test @TestMetadata("qualifierForStaticCase.kt") public void testQualifierForStaticCase() 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 df0ac6b8874..d3a5beb6953 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 @@ -42675,6 +42675,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase.kt"); } + @Test + @TestMetadata("qualifierEnumEntryOrCompanionMemberCase2.kt") + public void testQualifierEnumEntryOrCompanionMemberCase2() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase2.kt"); + } + @Test @TestMetadata("qualifierForStaticCase.kt") public void testQualifierForStaticCase() 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 8e7467143c1..03a55e8ef4f 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 @@ -42795,6 +42795,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase.kt"); } + @Test + @TestMetadata("qualifierEnumEntryOrCompanionMemberCase2.kt") + public void testQualifierEnumEntryOrCompanionMemberCase2() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase2.kt"); + } + @Test @TestMetadata("qualifierForStaticCase.kt") public void testQualifierForStaticCase() throws Exception { diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase2.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase2.fir.kt new file mode 100644 index 00000000000..f453249d087 --- /dev/null +++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase2.fir.kt @@ -0,0 +1,36 @@ +// ISSUE: KT-56520 (case 7, enum entry vs companion member, one companion in scope) +// FIR_DUMP + +// FILE: some/Some.kt +package some + +enum class Some { + foo; // (1) + + companion object {} +} + +// FILE: some2/Some.kt +package some2 + +enum class Some { + foo; // (2) + + companion object { + val foo = "2'" // (2') + } +} + +// FILE: some3/Some.java +package some3; + +public enum Some { + foo; // (3) +} + +// FILE: main.kt +import some.* +import some2.* +import some3.* + +fun test() = Some.foo diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase2.fir.txt b/compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase2.fir.txt new file mode 100644 index 00000000000..742bbf229be --- /dev/null +++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase2.fir.txt @@ -0,0 +1,59 @@ +FILE: Some.kt + package some + + public final enum class Some : R|kotlin/Enum| { + private constructor(): R|some/Some| { + super|>() + } + + public final static enum entry foo: R|some/Some| + public final companion object Companion : R|kotlin/Any| { + private constructor(): R|some/Some.Companion| { + super() + } + + } + + public final static fun values(): R|kotlin/Array| { + } + + public final static fun valueOf(value: R|kotlin/String|): R|some/Some| { + } + + public final static val entries: R|kotlin/enums/EnumEntries| + public get(): R|kotlin/enums/EnumEntries| + + } +FILE: Some.kt + package some2 + + public final enum class Some : R|kotlin/Enum| { + private constructor(): R|some2/Some| { + super|>() + } + + public final static enum entry foo: R|some2/Some| + public final companion object Companion : R|kotlin/Any| { + private constructor(): R|some2/Some.Companion| { + super() + } + + public final val foo: R|kotlin/String| = String(2') + public get(): R|kotlin/String| + + } + + public final static fun values(): R|kotlin/Array| { + } + + public final static fun valueOf(value: R|kotlin/String|): R|some2/Some| { + } + + public final static val entries: R|kotlin/enums/EnumEntries| + public get(): R|kotlin/enums/EnumEntries| + + } +FILE: main.kt + public final fun test(): { + ^test #.# + } diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase2.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase2.kt new file mode 100644 index 00000000000..f6193d64da0 --- /dev/null +++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase2.kt @@ -0,0 +1,36 @@ +// ISSUE: KT-56520 (case 7, enum entry vs companion member, one companion in scope) +// FIR_DUMP + +// FILE: some/Some.kt +package some + +enum class Some { + foo; // (1) + + companion object {} +} + +// FILE: some2/Some.kt +package some2 + +enum class Some { + foo; // (2) + + companion object { + val foo = "2'" // (2') + } +} + +// FILE: some3/Some.java +package some3; + +public enum Some { + foo; // (3) +} + +// FILE: main.kt +import some.* +import some2.* +import some3.* + +fun test() = Some.foo 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 f8fc0ca1651..51ec04892dd 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 @@ -44855,6 +44855,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase.kt"); } + @Test + @TestMetadata("qualifierEnumEntryOrCompanionMemberCase2.kt") + public void testQualifierEnumEntryOrCompanionMemberCase2() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/resolve/ambiguousTypeReferences/qualifierEnumEntryOrCompanionMemberCase2.kt"); + } + @Test @TestMetadata("qualifierForStaticCase.kt") public void testQualifierForStaticCase() throws Exception {