From 01d618105049d206bf19acd2aed463a68bf25cf1 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Mon, 5 Oct 2020 18:00:22 +0300 Subject: [PATCH] Add test on overriding declaration with a composite type with expect declaration --- .../common/common.kt | 15 +++++++++++++++ .../dependencies.txt | 6 ++++++ .../overrideExpectWithCompositeType/jvm/jvm.kt | 13 +++++++++++++ .../MultiplatformAnalysisTestGenerated.java | 5 +++++ 4 files changed, 39 insertions(+) create mode 100644 idea/testData/multiplatform/overrideExpectWithCompositeType/common/common.kt create mode 100644 idea/testData/multiplatform/overrideExpectWithCompositeType/dependencies.txt create mode 100644 idea/testData/multiplatform/overrideExpectWithCompositeType/jvm/jvm.kt diff --git a/idea/testData/multiplatform/overrideExpectWithCompositeType/common/common.kt b/idea/testData/multiplatform/overrideExpectWithCompositeType/common/common.kt new file mode 100644 index 00000000000..940c07085ed --- /dev/null +++ b/idea/testData/multiplatform/overrideExpectWithCompositeType/common/common.kt @@ -0,0 +1,15 @@ +expect class Expect + +class Box(val x: T) + +interface Base { + fun expectInReturnType(): Box + + fun expectInArgument(e: Box) + + fun Box.expectInReceiver() + + val expectVal: Box + + var expectVar: Box +} \ No newline at end of file diff --git a/idea/testData/multiplatform/overrideExpectWithCompositeType/dependencies.txt b/idea/testData/multiplatform/overrideExpectWithCompositeType/dependencies.txt new file mode 100644 index 00000000000..cefcd625e22 --- /dev/null +++ b/idea/testData/multiplatform/overrideExpectWithCompositeType/dependencies.txt @@ -0,0 +1,6 @@ +MODULE jvm { platform=[JVM] } +MODULE common { platform=[JVM] } + +jvm -> STDLIB_JVM { kind=DEPENDENCY } +common -> STDLIB_COMMON { kind=DEPENDENCY } +jvm -> common { kind=DEPENDS_ON } \ No newline at end of file diff --git a/idea/testData/multiplatform/overrideExpectWithCompositeType/jvm/jvm.kt b/idea/testData/multiplatform/overrideExpectWithCompositeType/jvm/jvm.kt new file mode 100644 index 00000000000..cf654228119 --- /dev/null +++ b/idea/testData/multiplatform/overrideExpectWithCompositeType/jvm/jvm.kt @@ -0,0 +1,13 @@ +actual typealias Expect = String + +interface Derived : Base { + override fun expectInReturnType(): Box + + override fun expectInArgument(e: Box) + + override fun Box.expectInReceiver() + + override val expectVal: Box + + override var expectVar: Box +} diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java index 6608cd7c7dd..793a5ef65e8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java @@ -183,6 +183,11 @@ public class MultiplatformAnalysisTestGenerated extends AbstractMultiplatformAna runTest("idea/testData/multiplatform/overrideExpect/"); } + @TestMetadata("overrideExpectWithCompositeType") + public void testOverrideExpectWithCompositeType() throws Exception { + runTest("idea/testData/multiplatform/overrideExpectWithCompositeType/"); + } + @TestMetadata("platformSpecificChecksInCommon") public void testPlatformSpecificChecksInCommon() throws Exception { runTest("idea/testData/multiplatform/platformSpecificChecksInCommon/");