From bf739198aa467499bd4187392e005c3b1c0f824b Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 19 Sep 2017 14:01:31 +0300 Subject: [PATCH] Fix regular quick-fix test with multi-platforms required --- .../idea/test/KotlinLightCodeInsightFixtureTestCase.kt | 4 +++- idea/testData/quickfix/implement/doNotAddHeader.kt | 5 ++++- idea/testData/quickfix/implement/doNotAddHeader.kt.after | 5 ++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt index 19c18181d34..b5938618e1f 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt @@ -132,12 +132,14 @@ abstract class KotlinLightCodeInsightFixtureTestCase : KotlinLightCodeInsightFix else if (InTextDirectivesUtils.isDirectiveDefined(fileText, "JS")) { return KotlinStdJSProjectDescriptor } + else if (InTextDirectivesUtils.isDirectiveDefined(fileText, "ENABLE_MULTIPLATFORM")) { + return KotlinProjectDescriptorWithFacet.KOTLIN_STABLE_WITH_MULTIPLATFORM + } } catch (e: IOException) { throw rethrow(e) } } - return KotlinLightProjectDescriptor.INSTANCE } diff --git a/idea/testData/quickfix/implement/doNotAddHeader.kt b/idea/testData/quickfix/implement/doNotAddHeader.kt index 29abff7f091..76753f89b4f 100644 --- a/idea/testData/quickfix/implement/doNotAddHeader.kt +++ b/idea/testData/quickfix/implement/doNotAddHeader.kt @@ -1,6 +1,9 @@ // "Implement members" "true" -// WITH_RUNTIME +// ENABLE_MULTIPLATFORM // ERROR: Expected interface 'InterfaceWithFuns' has no actual in module light_idea_test_case for JVM + +fun TODO(s: String): Nothing = null!! + expect interface InterfaceWithFuns { fun funInInterface() } diff --git a/idea/testData/quickfix/implement/doNotAddHeader.kt.after b/idea/testData/quickfix/implement/doNotAddHeader.kt.after index 4d7f2bd8e9e..ca0abbf627a 100644 --- a/idea/testData/quickfix/implement/doNotAddHeader.kt.after +++ b/idea/testData/quickfix/implement/doNotAddHeader.kt.after @@ -1,6 +1,9 @@ // "Implement members" "true" -// WITH_RUNTIME +// ENABLE_MULTIPLATFORM // ERROR: Expected interface 'InterfaceWithFuns' has no actual in module light_idea_test_case for JVM + +fun TODO(s: String): Nothing = null!! + expect interface InterfaceWithFuns { fun funInInterface() }