From 18206210cf54ccf4ca368c6079e83e2abc7acaa5 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 16 Jun 2023 14:41:35 +0200 Subject: [PATCH] K2: reproduce KT-59140 --- ...CompilerTestFE10TestdataTestGenerated.java | 6 ++++++ ...sticCompilerFE10TestDataTestGenerated.java | 6 ++++++ ...eeOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ ...siOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../j+k/staticImportViaInheritance.fir.kt | 21 +++++++++++++++++++ .../tests/j+k/staticImportViaInheritance.kt | 21 +++++++++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 ++++++ 7 files changed, 72 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/j+k/staticImportViaInheritance.fir.kt create mode 100644 compiler/testData/diagnostics/tests/j+k/staticImportViaInheritance.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 6f4cefc5bb9..8aba199c0d8 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 @@ -20174,6 +20174,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/j+k/specialBridges.kt"); } + @Test + @TestMetadata("staticImportViaInheritance.kt") + public void testStaticImportViaInheritance() throws Exception { + runTest("compiler/testData/diagnostics/tests/j+k/staticImportViaInheritance.kt"); + } + @Test @TestMetadata("StaticMembersFromSuperclasses.kt") public void testStaticMembersFromSuperclasses() 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 8b2b2830413..650b3c9b8f7 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 @@ -20174,6 +20174,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/j+k/specialBridges.kt"); } + @Test + @TestMetadata("staticImportViaInheritance.kt") + public void testStaticImportViaInheritance() throws Exception { + runTest("compiler/testData/diagnostics/tests/j+k/staticImportViaInheritance.kt"); + } + @Test @TestMetadata("StaticMembersFromSuperclasses.kt") public void testStaticMembersFromSuperclasses() 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 bd88cbf59ed..939180d5839 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 @@ -20174,6 +20174,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/j+k/specialBridges.kt"); } + @Test + @TestMetadata("staticImportViaInheritance.kt") + public void testStaticImportViaInheritance() throws Exception { + runTest("compiler/testData/diagnostics/tests/j+k/staticImportViaInheritance.kt"); + } + @Test @TestMetadata("StaticMembersFromSuperclasses.kt") public void testStaticMembersFromSuperclasses() 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 7ff44606559..a02f8c3f3dd 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 @@ -20180,6 +20180,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/j+k/specialBridges.kt"); } + @Test + @TestMetadata("staticImportViaInheritance.kt") + public void testStaticImportViaInheritance() throws Exception { + runTest("compiler/testData/diagnostics/tests/j+k/staticImportViaInheritance.kt"); + } + @Test @TestMetadata("StaticMembersFromSuperclasses.kt") public void testStaticMembersFromSuperclasses() throws Exception { diff --git a/compiler/testData/diagnostics/tests/j+k/staticImportViaInheritance.fir.kt b/compiler/testData/diagnostics/tests/j+k/staticImportViaInheritance.fir.kt new file mode 100644 index 00000000000..66ffec3ebe5 --- /dev/null +++ b/compiler/testData/diagnostics/tests/j+k/staticImportViaInheritance.fir.kt @@ -0,0 +1,21 @@ +// ISSUE: KT-59140 + +// FILE: pkg/Foo.java + +package pkg; + +abstract class CommonFoo { + public static final int BAR = 1; +} + +public class Foo extends CommonFoo {} + +// FILE: test.kt + +import pkg.Foo +import pkg.Foo.BAR + +fun test() { + val bar = BAR + val fooBar = Foo.BAR +} diff --git a/compiler/testData/diagnostics/tests/j+k/staticImportViaInheritance.kt b/compiler/testData/diagnostics/tests/j+k/staticImportViaInheritance.kt new file mode 100644 index 00000000000..c66804ca33d --- /dev/null +++ b/compiler/testData/diagnostics/tests/j+k/staticImportViaInheritance.kt @@ -0,0 +1,21 @@ +// ISSUE: KT-59140 + +// FILE: pkg/Foo.java + +package pkg; + +abstract class CommonFoo { + public static final int BAR = 1; +} + +public class Foo extends CommonFoo {} + +// FILE: test.kt + +import pkg.Foo +import pkg.Foo.BAR + +fun test() { + val bar = BAR + val fooBar = Foo.BAR +} 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 60b44a87ca5..4fd64f4aba3 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 @@ -20180,6 +20180,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/j+k/specialBridges.kt"); } + @Test + @TestMetadata("staticImportViaInheritance.kt") + public void testStaticImportViaInheritance() throws Exception { + runTest("compiler/testData/diagnostics/tests/j+k/staticImportViaInheritance.kt"); + } + @Test @TestMetadata("StaticMembersFromSuperclasses.kt") public void testStaticMembersFromSuperclasses() throws Exception {