From 80f4061a3db08d284cf51d77b717e2bbc185d053 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Fri, 18 Sep 2020 18:58:17 +0300 Subject: [PATCH] Add test on override with expect in return type --- .../multiplatform/overrideExpect/common/common.kt | 9 +++++++++ .../multiplatform/overrideExpect/dependencies.txt | 6 ++++++ idea/testData/multiplatform/overrideExpect/jvm/jvm.kt | 9 +++++++++ .../resolve/MultiplatformAnalysisTestGenerated.java | 5 +++++ 4 files changed, 29 insertions(+) create mode 100644 idea/testData/multiplatform/overrideExpect/common/common.kt create mode 100644 idea/testData/multiplatform/overrideExpect/dependencies.txt create mode 100644 idea/testData/multiplatform/overrideExpect/jvm/jvm.kt diff --git a/idea/testData/multiplatform/overrideExpect/common/common.kt b/idea/testData/multiplatform/overrideExpect/common/common.kt new file mode 100644 index 00000000000..3d39b1134d8 --- /dev/null +++ b/idea/testData/multiplatform/overrideExpect/common/common.kt @@ -0,0 +1,9 @@ +expect class Expect + +interface Base { + fun expectInReturnType(): Expect + + fun expectInArgument(e: Expect) + + fun Expect.expectInReceiver() +} \ No newline at end of file diff --git a/idea/testData/multiplatform/overrideExpect/dependencies.txt b/idea/testData/multiplatform/overrideExpect/dependencies.txt new file mode 100644 index 00000000000..cefcd625e22 --- /dev/null +++ b/idea/testData/multiplatform/overrideExpect/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/overrideExpect/jvm/jvm.kt b/idea/testData/multiplatform/overrideExpect/jvm/jvm.kt new file mode 100644 index 00000000000..2e8fe89c68f --- /dev/null +++ b/idea/testData/multiplatform/overrideExpect/jvm/jvm.kt @@ -0,0 +1,9 @@ +actual typealias Expect = String + +interface Derived : Base { + override fun expectInReturnType(): Expect + + override fun expectInArgument(e: Expect) + + override fun Expect.expectInReceiver() +} 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 e699956dffb..6608cd7c7dd 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java @@ -178,6 +178,11 @@ public class MultiplatformAnalysisTestGenerated extends AbstractMultiplatformAna runTest("idea/testData/multiplatform/multilevelParents/"); } + @TestMetadata("overrideExpect") + public void testOverrideExpect() throws Exception { + runTest("idea/testData/multiplatform/overrideExpect/"); + } + @TestMetadata("platformSpecificChecksInCommon") public void testPlatformSpecificChecksInCommon() throws Exception { runTest("idea/testData/multiplatform/platformSpecificChecksInCommon/");