Get rid of legacy definition in ScriptEvaluationConfigurationFromDefinition

^KTIJ-31294

Author: imbananko

plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptDefinition.kt

@@ -74,9 +74,8 @@ abstract class ScriptDefinition : UserDataHolderBase() {
         }
 
         override val evaluationConfiguration by lazy {
-            ScriptEvaluationConfigurationFromDefinition(
-                hostConfiguration,
-                legacyDefinition
+            ScriptEvaluationConfigurationFromHostConfiguration(
+                hostConfiguration
             )
         }
 
@@ -211,7 +210,7 @@ abstract class ScriptDefinition : UserDataHolderBase() {
             object : FromConfigurations(
                 hostConfiguration,
                 ScriptCompilationConfigurationFromDefinition(hostConfiguration, StandardScriptDefinition),
-                ScriptEvaluationConfigurationFromDefinition(hostConfiguration, StandardScriptDefinition)
+                ScriptEvaluationConfigurationFromHostConfiguration(hostConfiguration)
             ) {
                 override val isDefault = true
             }

plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptEvaluationConfigurationFromDefinition.kt renamed to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptEvaluationConfigurationFromHostConfiguration.kt

@@ -9,9 +9,8 @@ import kotlin.script.experimental.api.ScriptEvaluationConfiguration
 import kotlin.script.experimental.api.hostConfiguration
 import kotlin.script.experimental.host.ScriptingHostConfiguration
 
-class ScriptEvaluationConfigurationFromDefinition(
-    val hostConfiguration: ScriptingHostConfiguration,
-    val scriptDefinition: KotlinScriptDefinition
+class ScriptEvaluationConfigurationFromHostConfiguration(
+    val hostConfiguration: ScriptingHostConfiguration
 ) : ScriptEvaluationConfiguration(
     {
         hostConfiguration(hostConfiguration)

plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/repl/ReplInterpreter.kt

@@ -71,9 +71,10 @@ class ReplInterpreter(
             )
 
         compilationConfiguration = context.baseScriptCompilationConfiguration
-        evaluationConfiguration = ScriptEvaluationConfigurationFromDefinition(hostConfiguration, REPL_LINE_AS_SCRIPT_DEFINITION).with {
-            scriptExecutionWrapper<Any> { replConfiguration.executionInterceptor.execute(it) }
-        }
+        evaluationConfiguration =
+            ScriptEvaluationConfigurationFromHostConfiguration(hostConfiguration).with {
+                scriptExecutionWrapper<Any> { replConfiguration.executionInterceptor.execute(it) }
+            }
 
         replState = JvmReplCompilerState(
             {

plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptProviderTest.kt

@@ -110,6 +110,5 @@ private class TestScriptDefinitionSource(val counter: AtomicInteger, val defGens
 }
 
 private class TestCliScriptDefinitionProvider(private val standardDef: ScriptDefinition) : CliScriptDefinitionProvider() {
-    @Suppress("DEPRECATION", "OverridingDeprecatedMember", "OVERRIDE_DEPRECATION")
-    override fun getDefaultScriptDefinition(): KotlinScriptDefinition = standardDef.legacyDefinition
+    override fun getDefaultDefinition(): ScriptDefinition = standardDef
 }