From cec644e9dbd8221092ae629023c72715533cd6d2 Mon Sep 17 00:00:00 2001 From: Roman Efremov Date: Mon, 27 Nov 2023 15:40:29 +0100 Subject: [PATCH] [Test] Add test for expect nested classes unwrapping ...in type arguments, when they were actualized via typealias. ^KT-31636 --- ...icCompilerTestFE10TestdataTestGenerated.java | 6 ++++++ ...nosticCompilerFE10TestDataTestGenerated.java | 6 ++++++ ...PPDiagnosticsWithLightTreeTestGenerated.java | 6 ++++++ ...ntendMPPDiagnosticsWithPsiTestGenerated.java | 6 ++++++ ...ssViaActualTypealiasExpandInTypeParam.fir.kt | 17 +++++++++++++++++ ...dClassViaActualTypealiasExpandInTypeParam.kt | 17 +++++++++++++++++ ...assViaActualTypealiasExpandInTypeParam.ll.kt | 17 +++++++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 ++++++ 8 files changed, 81 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.fir.kt create mode 100644 compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.kt create mode 100644 compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.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 5550e20e4cf..bdfebc42273 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 @@ -23976,6 +23976,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.kt"); } + @Test + @TestMetadata("nestedClassViaActualTypealiasExpandInTypeParam.kt") + public void testNestedClassViaActualTypealiasExpandInTypeParam() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.kt"); + } + @Test @TestMetadata("nestedClassViaActualTypealiasWithTypeParam.kt") public void testNestedClassViaActualTypealiasWithTypeParam() 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 c7403d7e6db..3b2cfa020eb 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 @@ -23976,6 +23976,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.kt"); } + @Test + @TestMetadata("nestedClassViaActualTypealiasExpandInTypeParam.kt") + public void testNestedClassViaActualTypealiasExpandInTypeParam() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.kt"); + } + @Test @TestMetadata("nestedClassViaActualTypealiasWithTypeParam.kt") public void testNestedClassViaActualTypealiasWithTypeParam() 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 4265962ca97..9d3f353151f 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 @@ -337,6 +337,12 @@ public class FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated extends Abst runTest("compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.kt"); } + @Test + @TestMetadata("nestedClassViaActualTypealiasExpandInTypeParam.kt") + public void testNestedClassViaActualTypealiasExpandInTypeParam() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.kt"); + } + @Test @TestMetadata("nestedClassViaActualTypealiasWithTypeParam.kt") public void testNestedClassViaActualTypealiasWithTypeParam() 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 5958eb2402d..8b49a2dc042 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 @@ -337,6 +337,12 @@ public class FirOldFrontendMPPDiagnosticsWithPsiTestGenerated extends AbstractFi runTest("compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.kt"); } + @Test + @TestMetadata("nestedClassViaActualTypealiasExpandInTypeParam.kt") + public void testNestedClassViaActualTypealiasExpandInTypeParam() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.kt"); + } + @Test @TestMetadata("nestedClassViaActualTypealiasWithTypeParam.kt") public void testNestedClassViaActualTypealiasWithTypeParam() throws Exception { diff --git a/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.fir.kt new file mode 100644 index 00000000000..eddfe4166fc --- /dev/null +++ b/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.fir.kt @@ -0,0 +1,17 @@ +// MODULE: m1-common +// FILE: common.kt +expect class Foo { + class Inner { + fun foo(p: List) + } +} + +// MODULE: m2-jvm()()(m1-common) +// FILE: jvm.kt +class FooImpl { + class Inner { + fun foo(p: List) {} + } +} + +actual typealias Foo = FooImpl diff --git a/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.kt b/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.kt new file mode 100644 index 00000000000..dad17c52b50 --- /dev/null +++ b/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.kt @@ -0,0 +1,17 @@ +// MODULE: m1-common +// FILE: common.kt +expect class Foo { + class Inner { + fun foo(p: List) + } +} + +// MODULE: m2-jvm()()(m1-common) +// FILE: jvm.kt +class FooImpl { + class Inner { + fun foo(p: List) {} + } +} + +actual typealias Foo = FooImpl diff --git a/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.ll.kt new file mode 100644 index 00000000000..dad17c52b50 --- /dev/null +++ b/compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.ll.kt @@ -0,0 +1,17 @@ +// MODULE: m1-common +// FILE: common.kt +expect class Foo { + class Inner { + fun foo(p: List) + } +} + +// MODULE: m2-jvm()()(m1-common) +// FILE: jvm.kt +class FooImpl { + class Inner { + fun foo(p: List) {} + } +} + +actual typealias Foo = FooImpl 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 c3f1736eaa0..9975bae8a54 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 @@ -23976,6 +23976,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealias.kt"); } + @Test + @TestMetadata("nestedClassViaActualTypealiasExpandInTypeParam.kt") + public void testNestedClassViaActualTypealiasExpandInTypeParam() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/nestedClassViaActualTypealiasExpandInTypeParam.kt"); + } + @Test @TestMetadata("nestedClassViaActualTypealiasWithTypeParam.kt") public void testNestedClassViaActualTypealiasWithTypeParam() throws Exception {