From 7fbcfdf09e649d2146e9dab690401af3db3ce3d2 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Wed, 28 Mar 2018 16:50:06 +0200
Subject: [PATCH] Add config params for specifying target annotations, import
 param renaming

---
 .../kotlin/script/examples/jvm/resolve/maven/scriptDef.kt   | 2 +-
 .../experimental/api/scriptConfigurationProperties.kt       | 6 +++++-
 .../experimental/jvm/impl/BridgeDependenciesResolver.kt     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt b/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt
index 5ad5841ddb1..377286f75b3 100644
--- a/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt
+++ b/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt
@@ -30,7 +30,7 @@ abstract class MyScriptWithMavenDeps {
 val myJvmConfigParams = jvmJavaHomeParams + with(ScriptCompileConfigurationProperties) {
     listOf(
         baseClass<MyScriptWithMavenDeps>(),
-        importedPackages(DependsOn::class.qualifiedName!!, Repository::class.qualifiedName!!),
+        defaultImports(DependsOn::class.qualifiedName!!, Repository::class.qualifiedName!!),
         dependencies(
             JvmDependency(
                 scriptCompilationClasspathFromContext(
diff --git a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptConfigurationProperties.kt b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptConfigurationProperties.kt
index ffb0594c1e5..9a8c269f288 100644
--- a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptConfigurationProperties.kt
+++ b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptConfigurationProperties.kt
@@ -23,7 +23,7 @@ object ScriptCompileConfigurationProperties {
 
     val contextVariables by typedKey<Map<String, KType>>() // external variables
 
-    val importedPackages by typedKey<List<String>>()
+    val defaultImports by typedKey<List<String>>()
 
     val restrictions by typedKey<List<ResolvingRestrictionRule>>()
 
@@ -31,6 +31,10 @@ object ScriptCompileConfigurationProperties {
 
     val dependencies by typedKey<List<ScriptDependency>>()
 
+    val generatedClassAnnotations by typedKey<List<KClass<out Annotation>>>()
+
+    val generatedMethodAnnotations by typedKey<List<KClass<out Annotation>>>()
+
     val compilerOptions by typedKey<List<String>>() // Q: CommonCompilerOptions instead?
 
     val refineBeforeParsing by typedKey<Boolean>() // default: false
diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/BridgeDependenciesResolver.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/BridgeDependenciesResolver.kt
index 6db95c20f8f..54a9e46c5bf 100644
--- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/BridgeDependenciesResolver.kt
+++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/BridgeDependenciesResolver.kt
@@ -66,7 +66,7 @@ class BridgeDependenciesResolver(
             DependenciesResolver.ResolveResult.Success(
                 ScriptDependencies(
                     classpath = newClasspath, // TODO: maybe it should return only increment from the initial config
-                    imports = refinedConfiguration.getOrNull(ScriptCompileConfigurationProperties.importedPackages)?.toList()
+                    imports = refinedConfiguration.getOrNull(ScriptCompileConfigurationProperties.defaultImports)?.toList()
                             ?: emptyList()
                 ),
                 diagnostics