From bfc775faf5c60a6397e99d15d29b5aa4aaab8d4f Mon Sep 17 00:00:00 2001 From: Roman Efremov Date: Mon, 23 Oct 2023 13:54:46 +0200 Subject: [PATCH] [Tests] Create test for nested classes matching when actualized via typealias ^KT-31636 --- ...CompilerTestFE10TestdataTestGenerated.java | 6 ++++ ...sticCompilerFE10TestDataTestGenerated.java | 6 ++++ ...DiagnosticsWithLightTreeTestGenerated.java | 6 ++++ ...endMPPDiagnosticsWithPsiTestGenerated.java | 6 ++++ .../nestedClassViaActualTypealias.fir.kt | 31 +++++++++++++++++++ .../nestedClassViaActualTypealias.kt | 31 +++++++++++++++++++ .../nestedClassViaActualTypealias.ll.kt | 31 +++++++++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 ++++ 8 files changed, 123 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.fir.kt create mode 100644 compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.kt create mode 100644 compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.ll.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 3dfa331f303..64f5ef55112 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 @@ -23970,6 +23970,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt"); } + @Test + @TestMetadata("nestedClassViaActualTypealias.kt") + public void testNestedClassViaActualTypealias() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.kt"); + } + @Test @TestMetadata("optionalExpectationDiagnostics.kt") public void testOptionalExpectationDiagnostics() 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 d43659729f2..0fdd7107711 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 @@ -23970,6 +23970,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt"); } + @Test + @TestMetadata("nestedClassViaActualTypealias.kt") + public void testNestedClassViaActualTypealias() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.kt"); + } + @Test @TestMetadata("optionalExpectationDiagnostics.kt") public void testOptionalExpectationDiagnostics() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java index 644295e0d31..efa04d685a1 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java @@ -331,6 +331,12 @@ public class FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated extends Abst runTest("compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt"); } + @Test + @TestMetadata("nestedClassViaActualTypealias.kt") + public void testNestedClassViaActualTypealias() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.kt"); + } + @Test @TestMetadata("optionalExpectationDiagnostics.kt") public void testOptionalExpectationDiagnostics() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java index 926923aa758..293d5edbf87 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java @@ -331,6 +331,12 @@ public class FirOldFrontendMPPDiagnosticsWithPsiTestGenerated extends AbstractFi runTest("compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt"); } + @Test + @TestMetadata("nestedClassViaActualTypealias.kt") + public void testNestedClassViaActualTypealias() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.kt"); + } + @Test @TestMetadata("optionalExpectationDiagnostics.kt") public void testOptionalExpectationDiagnostics() throws Exception { diff --git a/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.fir.kt new file mode 100644 index 00000000000..f22c5df5de3 --- /dev/null +++ b/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.fir.kt @@ -0,0 +1,31 @@ +// MODULE: m1-common +// FILE: common.kt +expect class Foo { + class Inner() +} + +expect class SeveralInner { + class Inner1 { + class Inner2 { + class Inner3() + } + } +} + +// MODULE: m2-jvm()()(m1-common) +// FILE: jvm.kt +class FooImpl { + class Inner +} + +actual typealias Foo = FooImpl + +class SeveralInnerImpl { + class Inner1 { + class Inner2 { + class Inner3 + } + } +} + +actual typealias SeveralInner = SeveralInnerImpl diff --git a/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.kt b/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.kt new file mode 100644 index 00000000000..9196eb449c3 --- /dev/null +++ b/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.kt @@ -0,0 +1,31 @@ +// MODULE: m1-common +// FILE: common.kt +expect class Foo { + class Inner() +} + +expect class SeveralInner { + class Inner1 { + class Inner2 { + class Inner3() + } + } +} + +// MODULE: m2-jvm()()(m1-common) +// FILE: jvm.kt +class FooImpl { + class Inner +} + +actual typealias Foo = FooImpl + +class SeveralInnerImpl { + class Inner1 { + class Inner2 { + class Inner3 + } + } +} + +actual typealias SeveralInner = SeveralInnerImpl diff --git a/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.ll.kt new file mode 100644 index 00000000000..9196eb449c3 --- /dev/null +++ b/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.ll.kt @@ -0,0 +1,31 @@ +// MODULE: m1-common +// FILE: common.kt +expect class Foo { + class Inner() +} + +expect class SeveralInner { + class Inner1 { + class Inner2 { + class Inner3() + } + } +} + +// MODULE: m2-jvm()()(m1-common) +// FILE: jvm.kt +class FooImpl { + class Inner +} + +actual typealias Foo = FooImpl + +class SeveralInnerImpl { + class Inner1 { + class Inner2 { + class Inner3 + } + } +} + +actual typealias SeveralInner = SeveralInnerImpl 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 5abb15d0269..60f0b416da0 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 @@ -23970,6 +23970,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt"); } + @Test + @TestMetadata("nestedClassViaActualTypealias.kt") + public void testNestedClassViaActualTypealias() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.kt"); + } + @Test @TestMetadata("optionalExpectationDiagnostics.kt") public void testOptionalExpectationDiagnostics() throws Exception {