From 4b7234d27ed01c9742bd4ac0185006b597831e51 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 18 Jul 2023 14:51:38 +0200 Subject: [PATCH] K2: add test for already fixed qualifier resolve issue #KT-57845 --- ...CompilerTestFE10TestdataTestGenerated.java | 6 ++++++ ...sticCompilerFE10TestDataTestGenerated.java | 6 ++++++ ...eeOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ ...siOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../diagnostics/tests/regressions/kt57845.kt | 19 +++++++++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 ++++++ 6 files changed, 49 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/regressions/kt57845.kt 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 39d87592255..172f03e3603 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 @@ -27110,6 +27110,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/regressions/kt575.kt"); } + @Test + @TestMetadata("kt57845.kt") + public void testKt57845() throws Exception { + runTest("compiler/testData/diagnostics/tests/regressions/kt57845.kt"); + } + @Test @TestMetadata("kt58.kt") public void testKt58() 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 e01ce0dfe9e..54b59f33187 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 @@ -27110,6 +27110,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/regressions/kt575.kt"); } + @Test + @TestMetadata("kt57845.kt") + public void testKt57845() throws Exception { + runTest("compiler/testData/diagnostics/tests/regressions/kt57845.kt"); + } + @Test @TestMetadata("kt58.kt") public void testKt58() 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 d8694c57d10..a3b8e4ae72b 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 @@ -27110,6 +27110,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/regressions/kt575.kt"); } + @Test + @TestMetadata("kt57845.kt") + public void testKt57845() throws Exception { + runTest("compiler/testData/diagnostics/tests/regressions/kt57845.kt"); + } + @Test @TestMetadata("kt58.kt") public void testKt58() 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 af1ea7fd622..71cb3019999 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 @@ -27122,6 +27122,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/regressions/kt575.kt"); } + @Test + @TestMetadata("kt57845.kt") + public void testKt57845() throws Exception { + runTest("compiler/testData/diagnostics/tests/regressions/kt57845.kt"); + } + @Test @TestMetadata("kt58.kt") public void testKt58() throws Exception { diff --git a/compiler/testData/diagnostics/tests/regressions/kt57845.kt b/compiler/testData/diagnostics/tests/regressions/kt57845.kt new file mode 100644 index 00000000000..6d41fed4c36 --- /dev/null +++ b/compiler/testData/diagnostics/tests/regressions/kt57845.kt @@ -0,0 +1,19 @@ +// FIR_IDENTICAL +// TARGET_BACKEND: JVM_IR + +// FILE: priv/members/check/MyJClass.java +package priv.members.check; + +public class MyJClass { + public static String O = "O"; + public String k() { return "K"; } +} + +// FILE: test.kt +fun test(): String { + val k: priv.members.check.MyJClass + k = priv.members.check.MyJClass() + + val o = priv.members.check.MyJClass.O + return o + k.k() +} 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 865056d5b12..721dffc401b 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 @@ -28702,6 +28702,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/regressions/kt575.kt"); } + @Test + @TestMetadata("kt57845.kt") + public void testKt57845() throws Exception { + runTest("compiler/testData/diagnostics/tests/regressions/kt57845.kt"); + } + @Test @TestMetadata("kt58.kt") public void testKt58() throws Exception {