K2 Scripting: fix order of arguments processing

and base class handling:
Since in K2 we do not distinguish between script arguments taken from
the base class and provided properties, we need this extra functionality
to preserve the argument order of K1 scripts.
This is a temporary measure, since we're going to deprecate base class
usage at some point (KT-60449), so the relevant constructor arguments
should disappear too.

libraries/scripting/common/src/kotlin/script/experimental/impl/compilationInternals.kt

@@ -0,0 +1,14 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.script.experimental.impl
+
+import kotlin.script.experimental.api.ScriptCompilationConfigurationKeys
+import kotlin.script.experimental.util.PropertiesCollection
+
+/**
+ * Set by the compiler: the language version used for script compilation
+ */
+val ScriptCompilationConfigurationKeys._languageVersion by PropertiesCollection.key<String>()

libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ConfigurationDslTest.kt

@@ -22,7 +22,7 @@ import kotlin.script.experimental.jvmhost.createJvmEvaluationConfigurationFromTe
 class ConfigurationDslTest : TestCase() {
 
     @Test
-    fun testComposableRefinementHandlers() = expectTestToFailOnK2 {
+    fun testComposableRefinementHandlers() {
         val baseConfig = createJvmCompilationConfigurationFromTemplate<SimpleScript> {
             updateClasspath(classpathFromClass<SimpleScript>())
             defaultImports(MyTestAnnotation1::class, MyTestAnnotation2::class)

libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ConstructorArgumentOrderTest.kt

@@ -36,7 +36,7 @@ class ConstructorArgumentsOrderTest {
     }
 
     @Test
-    fun testScriptWithBoth() = expectTestToFailOnK2 {
+    fun testScriptWithBoth() {
         val res = evalString<ScriptWithBoth>("""println(providedString + receiverString)""") {
             providedProperties("providedString" to "Hello")
             implicitReceivers(ImplicitReceiverClass(" Both!"))

libraries/scripting/jvm/src/kotlin/script/experimental/jvm/BasicJvmScriptEvaluator.kt

@@ -8,6 +8,7 @@ package kotlin.script.experimental.jvm
 import java.lang.reflect.InvocationTargetException
 import kotlin.reflect.KClass
 import kotlin.script.experimental.api.*
+import kotlin.script.experimental.impl._languageVersion
 
 open class BasicJvmScriptEvaluator : ScriptEvaluator {
 
@@ -71,6 +72,13 @@ open class BasicJvmScriptEvaluator : ScriptEvaluator {
         refinedEvalConfiguration: ScriptEvaluationConfiguration,
         importedScriptsEvalResults: List<EvaluationResult>
     ): Any {
+        val isCompiledWithK2 =
+            refinedEvalConfiguration[ScriptEvaluationConfiguration.compilationConfiguration]
+                ?.get(ScriptCompilationConfiguration._languageVersion)
+                ?.let {
+                    it.substringBefore('.').toIntOrNull()?.let { it >= 2 }
+                } == true
+
         val args = ArrayList<Any?>()
 
         refinedEvalConfiguration[ScriptEvaluationConfiguration.previousSnippets]?.let {
@@ -81,6 +89,12 @@ open class BasicJvmScriptEvaluator : ScriptEvaluator {
             args.addAll(it)
         }
 
+        if (isCompiledWithK2) {
+            refinedEvalConfiguration[ScriptEvaluationConfiguration.providedProperties]?.forEach {
+                args.add(it.value)
+            }
+        }
+
         importedScriptsEvalResults.forEach {
             args.add(it.returnValue.scriptInstance)
         }
@@ -88,8 +102,11 @@ open class BasicJvmScriptEvaluator : ScriptEvaluator {
         refinedEvalConfiguration[ScriptEvaluationConfiguration.implicitReceivers]?.let {
             args.addAll(it)
         }
-        refinedEvalConfiguration[ScriptEvaluationConfiguration.providedProperties]?.forEach {
-            args.add(it.value)
+
+        if (!isCompiledWithK2) {
+            refinedEvalConfiguration[ScriptEvaluationConfiguration.providedProperties]?.forEach {
+                args.add(it.value)
+            }
         }
 
         val ctor = java.constructors.single()