diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt index 7d314e86269..f9aa4202795 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt @@ -129,6 +129,9 @@ abstract class KotlinLightCodeInsightFixtureTestCase : KotlinLightCodeInsightFix else if (InTextDirectivesUtils.isDirectiveDefined(fileText, "RUNTIME_WITH_REFLECT")) { return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE_WITH_REFLECT } + else if (InTextDirectivesUtils.isDirectiveDefined(fileText, "RUNTIME_WITH_SCRIPT_RUNTIME")) { + return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE_WITH_SCRIPT_RUNTIME + } else if (InTextDirectivesUtils.isDirectiveDefined(fileText, "RUNTIME") || InTextDirectivesUtils.isDirectiveDefined(fileText, "WITH_RUNTIME")) { return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt.173 b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt.173 index 26e09a8f1c0..85168635974 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt.173 +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt.173 @@ -130,6 +130,9 @@ abstract class KotlinLightCodeInsightFixtureTestCase : KotlinLightCodeInsightFix else if (InTextDirectivesUtils.isDirectiveDefined(fileText, "RUNTIME_WITH_REFLECT")) { return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE_WITH_REFLECT } + else if (InTextDirectivesUtils.isDirectiveDefined(fileText, "RUNTIME_WITH_SCRIPT_RUNTIME")) { + return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE_WITH_SCRIPT_RUNTIME + } else if (InTextDirectivesUtils.isDirectiveDefined(fileText, "RUNTIME") || InTextDirectivesUtils.isDirectiveDefined(fileText, "WITH_RUNTIME")) { return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinWithJdkAndRuntimeLightProjectDescriptor.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinWithJdkAndRuntimeLightProjectDescriptor.java index be836bab207..994bb2bddfe 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinWithJdkAndRuntimeLightProjectDescriptor.java +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinWithJdkAndRuntimeLightProjectDescriptor.java @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.idea.test; import com.intellij.openapi.projectRoots.Sdk; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.utils.PathUtil; import java.io.File; @@ -44,6 +43,12 @@ public class KotlinWithJdkAndRuntimeLightProjectDescriptor extends KotlinJdkAndL PathUtil.getKotlinPathsForDistDirectory().getKotlinTestPath()) ); + @NotNull + public static final KotlinWithJdkAndRuntimeLightProjectDescriptor INSTANCE_WITH_SCRIPT_RUNTIME = new KotlinWithJdkAndRuntimeLightProjectDescriptor( + Arrays.asList(ForTestCompileRuntime.runtimeJarForTests(), + PathUtil.getKotlinPathsForDistDirectory().getScriptRuntimePath()) + ); + @NotNull public static final KotlinWithJdkAndRuntimeLightProjectDescriptor INSTANCE_WITH_REFLECT = new KotlinWithJdkAndRuntimeLightProjectDescriptor( Arrays.asList(ForTestCompileRuntime.runtimeJarForTests(), diff --git a/idea/testData/checker/scripts/if.kts b/idea/testData/checker/scripts/if.kts index 550902aa573..ad8ceeae7b1 100644 --- a/idea/testData/checker/scripts/if.kts +++ b/idea/testData/checker/scripts/if.kts @@ -1,3 +1,5 @@ +// RUNTIME_WITH_SCRIPT_RUNTIME + val c = true if (c) { 2 + 3 diff --git a/idea/testData/checker/scripts/packageStatement.kts b/idea/testData/checker/scripts/packageStatement.kts index 0952b9f8685..cd5b02dde11 100644 --- a/idea/testData/checker/scripts/packageStatement.kts +++ b/idea/testData/checker/scripts/packageStatement.kts @@ -1,3 +1,5 @@ +// RUNTIME_WITH_SCRIPT_RUNTIME + package org.my val x = 1 \ No newline at end of file diff --git a/idea/testData/checker/scripts/simple.kts b/idea/testData/checker/scripts/simple.kts index 28c57bb673d..215a12283ad 100644 --- a/idea/testData/checker/scripts/simple.kts +++ b/idea/testData/checker/scripts/simple.kts @@ -1,3 +1,5 @@ +// RUNTIME_WITH_SCRIPT_RUNTIME + fun f() { } diff --git a/idea/testData/checker/scripts/uninitializedVariable.kts b/idea/testData/checker/scripts/uninitializedVariable.kts index 773b76d7092..ebdfdb0e64d 100644 --- a/idea/testData/checker/scripts/uninitializedVariable.kts +++ b/idea/testData/checker/scripts/uninitializedVariable.kts @@ -1,2 +1,4 @@ +// RUNTIME_WITH_SCRIPT_RUNTIME + val x = y val y = 3 \ No newline at end of file