Rename script annotation params according to configuration keys...

rename evaluation params consistently too

compiler/tests/org/jetbrains/kotlin/codegen/AbstractCustomScriptCodegenTest.kt

@@ -140,5 +140,5 @@ object TestScriptWithSimpleEnvVarsConfiguration : ScriptCompilationConfiguration
 abstract class TestScriptWithSimpleEnvVars
 
 @Suppress("unused")
-@KotlinScript(extension = "customext")
+@KotlinScript(fileExtension = "customext")
 abstract class TestScriptWithNonKtsExtension(val name: String)

idea/testData/script/definition/highlighting/customExtension/mainModule/template/template.kt

@@ -8,5 +8,5 @@ import kotlin.script.templates.ScriptTemplateDefinition
 import kotlin.script.experimental.annotations.KotlinScript
 import kotlin.script.experimental.annotations.KotlinScriptEvaluator
 
-@KotlinScript(name = "Kotlin Script with custom extension", extension = "mykts")
+@KotlinScript(displayName = "Kotlin Script with custom extension", fileExtension = "mykts")
 open class Template

libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt

@@ -20,7 +20,7 @@ import kotlin.script.experimental.jvm.dependenciesFromCurrentContext
 import kotlin.script.experimental.jvm.jvm
 
 @KotlinScript(
-    extension = "scriptwithdeps.kts",
+    fileExtension = "scriptwithdeps.kts",
     compilationConfiguration = ScriptWithMavenDepsConfiguration::class
 )
 abstract class ScriptWithMavenDeps

libraries/examples/scripting/jvm-simple-script/script/src/org/jetbrains/kotlin/script/examples/jvm/simple/scriptDef.kt

@@ -7,5 +7,5 @@ package org.jetbrains.kotlin.script.examples.jvm.simple
 
 import kotlin.script.experimental.annotations.KotlinScript
 
-@KotlinScript(extension = "simplescript.kts")
+@KotlinScript(fileExtension = "simplescript.kts")
 abstract class SimpleScript

libraries/scripting/common/src/kotlin/script/experimental/annotations/scriptAnnotations.kt

@@ -3,11 +3,6 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-/*
- * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
 @file:Suppress("unused")
 
 package kotlin.script.experimental.annotations
@@ -18,8 +13,8 @@ import kotlin.script.experimental.api.ScriptCompilationConfiguration
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 annotation class KotlinScript(
-    val name: String = "Kotlin script",
+    val displayName: String = "Kotlin script",
-    val extension: String = "kts",
+    val fileExtension: String = "kts",
-    val compilationConfiguration: KClass<out ScriptCompilationConfiguration> = ScriptCompilationConfiguration.Default::class // object or class filled in 0-ary constructor
+    val compilationConfiguration: KClass<out ScriptCompilationConfiguration> = ScriptCompilationConfiguration.Default::class
 )
 

libraries/scripting/common/src/kotlin/script/experimental/api/scriptEvaluation.kt

@@ -28,7 +28,7 @@ class ScriptEvaluationConfiguration(baseEvaluationConfigurations: Iterable<Scrip
 
 val ScriptEvaluationConfigurationKeys.implicitReceivers by PropertiesCollection.key<List<Any>>()
 
-val ScriptEvaluationConfigurationKeys.contextVariables by PropertiesCollection.key<Map<String, Any?>>() // external variables
+val ScriptEvaluationConfigurationKeys.providedProperties by PropertiesCollection.key<Map<String, Any?>>() // external variables
 
 val ScriptEvaluationConfigurationKeys.constructorArgs by PropertiesCollection.key<List<Any?>>()
 

libraries/scripting/common/src/kotlin/script/experimental/host/configurationFromTemplate.kt

@@ -61,10 +61,10 @@ fun createCompilationConfigurationFromTemplate(
             baseClass(loadedBaseClassType)
         }
         if (fileExtension() == null) {
-            fileExtension(mainAnnotation.extension)
+            fileExtension(mainAnnotation.fileExtension)
         }
         if (displayName() == null) {
-            displayName(mainAnnotation.name)
+            displayName(mainAnnotation.displayName)
         }
 
         body()

libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/jvmScriptEvaluation.kt

@@ -35,7 +35,7 @@ open class BasicJvmScriptEvaluator : ScriptEvaluator {
                     // return res
                     val scriptClass = res.value
                     val args = ArrayList<Any?>()
-                    scriptEvaluationConfiguration?.get(ScriptEvaluationConfiguration.contextVariables)?.forEach {
+                    scriptEvaluationConfiguration?.get(ScriptEvaluationConfiguration.providedProperties)?.forEach {
                         args.add(it.value)
                     }
                     scriptEvaluationConfiguration?.get(ScriptEvaluationConfiguration.implicitReceivers)?.let {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinScripting/script-template/src/main/kotlin/GreetScriptTemplate.kt

@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.test
 
 import kotlin.script.experimental.annotations.*
 
-@KotlinScript(extension = "greet.kts")
+@KotlinScript(fileExtension = "greet.kts")
 abstract class GreetScriptTemplate {
     fun greet(subject: String) {
         println("Hello, $subject!")

libraries/tools/kotlin-main-kts/src/org/jetbrains/kotlin/mainKts/scriptDef.kt

@@ -20,7 +20,7 @@ import kotlin.script.experimental.jvm.dependenciesFromCurrentContext
 import kotlin.script.experimental.jvm.jvm
 
 @Suppress("unused")
-@KotlinScript(extension = "main.kts", compilationConfiguration = MainKtsScriptDefinition::class)
+@KotlinScript(fileExtension = "main.kts", compilationConfiguration = MainKtsScriptDefinition::class)
 abstract class MainKtsScript(val args: Array<String>)
 
 object MainKtsScriptDefinition : ScriptCompilationConfiguration(

plugins/scripting/scripting-cli/testData/lazyDefinitions/definitions/TestScriptWithReceivers.kt

@@ -8,5 +8,5 @@ object TestScriptWithReceiversDefinition : ScriptCompilationConfiguration(
         implicitReceivers(String::class)
     })
 
-@KotlinScript(extension = "1.kts", compilationConfiguration = TestScriptWithReceiversDefinition::class)
+@KotlinScript(fileExtension = "1.kts", compilationConfiguration = TestScriptWithReceiversDefinition::class)
 abstract class TestScriptWithReceivers

plugins/scripting/scripting-cli/testData/lazyDefinitions/definitions/TestScriptWithSimpleEnvVars.kt

@@ -8,6 +8,6 @@ object TestScriptWithSimpleEnvVarsDefinition : ScriptCompilationConfiguration(
         providedProperties("stringVar1" to String::class)
     })
 
-@KotlinScript(extension = "2.kts", compilationConfiguration = TestScriptWithSimpleEnvVarsDefinition::class)
+@KotlinScript(fileExtension = "2.kts", compilationConfiguration = TestScriptWithSimpleEnvVarsDefinition::class)
 abstract class TestScriptWithSimpleEnvVars