From da2b60ffa6f5504b9e12fbd56c15aa8dab3e8d9a Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Fri, 17 Aug 2018 17:52:39 +0200
Subject: [PATCH] Fix discovery tests after refactoring

---
 .../definitions/TestScriptWithReceivers.kt        | 15 +++++----------
 .../definitions/TestScriptWithSimpleEnvVars.kt    | 15 +++++----------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/plugins/scripting/scripting-cli/testData/lazyDefinitions/definitions/TestScriptWithReceivers.kt b/plugins/scripting/scripting-cli/testData/lazyDefinitions/definitions/TestScriptWithReceivers.kt
index 27cc46068c8..d69779d3433 100644
--- a/plugins/scripting/scripting-cli/testData/lazyDefinitions/definitions/TestScriptWithReceivers.kt
+++ b/plugins/scripting/scripting-cli/testData/lazyDefinitions/definitions/TestScriptWithReceivers.kt
@@ -2,16 +2,11 @@
 import kotlin.script.experimental.annotations.*
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.util.*
-import kotlin.script.experimental.misc.*
-import kotlin.reflect.full.starProjectedType
 
-object TestScriptWithReceiversConfiguration : ArrayList<Pair<TypedKey<*>, Any?>>(
-    listOf(
-        ScriptCompileConfigurationProperties.scriptImplicitReceivers(String::class.starProjectedType)
-    )
-)
+object TestScriptWithReceiversDefinition : ScriptDefinition(
+    {
+        implicitReceivers<String>()
+    })
 
-@KotlinScript
-@KotlinScriptFileExtension("1.kts")
-@KotlinScriptDefaultCompilationConfiguration(TestScriptWithReceiversConfiguration::class)
+@KotlinScript(extension = "1.kts", definition = TestScriptWithReceiversDefinition::class)
 abstract class TestScriptWithReceivers
diff --git a/plugins/scripting/scripting-cli/testData/lazyDefinitions/definitions/TestScriptWithSimpleEnvVars.kt b/plugins/scripting/scripting-cli/testData/lazyDefinitions/definitions/TestScriptWithSimpleEnvVars.kt
index 1119de46dda..630cf53bb5d 100644
--- a/plugins/scripting/scripting-cli/testData/lazyDefinitions/definitions/TestScriptWithSimpleEnvVars.kt
+++ b/plugins/scripting/scripting-cli/testData/lazyDefinitions/definitions/TestScriptWithSimpleEnvVars.kt
@@ -2,17 +2,12 @@
 import kotlin.script.experimental.annotations.*
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.util.*
-import kotlin.script.experimental.misc.*
-import kotlin.reflect.full.starProjectedType
 
-object TestScriptWithSimpleEnvVarsConfiguration : ArrayList<Pair<TypedKey<*>, Any?>>(
-    listOf(
-        ScriptCompileConfigurationProperties.contextVariables("stringVar1" to String::class.starProjectedType)
-    )
-)
+object TestScriptWithSimpleEnvVarsDefinition : ScriptDefinition(
+    {
+        providedProperties("stringVar1" to String::class)
+    })
 
-@KotlinScript
-@KotlinScriptFileExtension("2.kts")
-@KotlinScriptDefaultCompilationConfiguration(TestScriptWithSimpleEnvVarsConfiguration::class)
+@KotlinScript(extension = "2.kts", definition = TestScriptWithSimpleEnvVarsDefinition::class)
 abstract class TestScriptWithSimpleEnvVars