From 75fb74b26239f00765be734cbf04d2df0f5bdeed Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Tue, 30 Apr 2019 19:52:51 +0700 Subject: [PATCH] Fix runtime instance for AbstractJvmOptimizeImportsTest --- .../kotlin/idea/imports/AbstractOptimizeImportsTest.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/imports/AbstractOptimizeImportsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/imports/AbstractOptimizeImportsTest.kt index 402df8efc69..7e3c2b82cac 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/imports/AbstractOptimizeImportsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/imports/AbstractOptimizeImportsTest.kt @@ -5,8 +5,10 @@ package org.jetbrains.kotlin.idea.imports +import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.AbstractImportsTest import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.psi.KtFile abstract class AbstractOptimizeImportsTest : AbstractImportsTest() { @@ -24,7 +26,11 @@ abstract class AbstractOptimizeImportsTest : AbstractImportsTest() { get() = Integer.MAX_VALUE } -abstract class AbstractJvmOptimizeImportsTest : AbstractOptimizeImportsTest() +abstract class AbstractJvmOptimizeImportsTest : AbstractOptimizeImportsTest() { + override fun getProjectDescriptor(): LightProjectDescriptor = + if (fileName().endsWith(".kts")) KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE_WITH_SCRIPT_RUNTIME + else KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE_FULL_JDK +} abstract class AbstractJsOptimizeImportsTest : AbstractOptimizeImportsTest() { override fun getProjectDescriptor() = KotlinStdJSProjectDescriptor