From 99a5885aa73e191d10f5569be759618f85d6c879 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Sat, 23 Mar 2019 09:52:02 +0100
Subject: [PATCH] Fix ScriptingCompilerPluginTest after creating a separate jar
 with shared plugin code

---
 .../compiler/plugin/ScriptingCompilerPluginTest.kt         | 7 +++++--
 .../ScriptiDefinitionsFromClasspathDiscoverySource.kt      | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt
index 8a1ad624a93..dd335460a0b 100644
--- a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt
+++ b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt
@@ -18,6 +18,8 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler
 import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
 import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots
+import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption
+import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.JVMConfigurationKeys
 import org.jetbrains.kotlin.scripting.shared.definitions.SCRIPT_DEFINITION_MARKERS_PATH
@@ -35,7 +37,7 @@ import java.io.File
 class ScriptingCompilerPluginTest : TestCaseWithTmpdir() {
 
     companion object {
-        const val TEST_DATA_DIR = "plugins/scripting/scripting-cli/testData"
+        const val TEST_DATA_DIR = "plugins/scripting/scripting-compiler/testData"
     }
 
     private val kotlinPaths: KotlinPaths by lazy(LazyThreadSafetyMode.PUBLICATION) {
@@ -57,6 +59,7 @@ class ScriptingCompilerPluginTest : TestCaseWithTmpdir() {
             put(JVMConfigurationKeys.OUTPUT_DIRECTORY, destDir)
             confBody()
         }
+        configuration.add(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS, ScriptingCompilerConfigurationComponentRegistrar())
 
         return KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
     }
@@ -69,7 +72,7 @@ class ScriptingCompilerPluginTest : TestCaseWithTmpdir() {
         val configuration = CompilerConfiguration()
 
         cmdlineProcessor.processOption(
-            ScriptingCommandLineProcessor.LEGACY_SCRIPT_RESOLVER_ENVIRONMENT_OPTION,
+            ScriptingCommandLineProcessor.LEGACY_SCRIPT_RESOLVER_ENVIRONMENT_OPTION as AbstractCliOption,
             """abc=def,11="ab cd \\ \"",long="$longStr"""",
             configuration
         )
diff --git a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt b/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt
index b3431f53c4e..11ce7b1afc1 100644
--- a/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt
+++ b/plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt
@@ -22,7 +22,7 @@ import kotlin.script.experimental.host.createCompilationConfigurationFromTemplat
 import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
 import kotlin.script.templates.ScriptTemplateDefinition
 
-internal const val SCRIPT_DEFINITION_MARKERS_PATH = "META-INF/kotlin/script/templates/"
+const val SCRIPT_DEFINITION_MARKERS_PATH = "META-INF/kotlin/script/templates/"
 internal const val SCRIPT_DEFINITION_MARKERS_EXTENSION_WITH_DOT = ".classname"
 
 class ScriptDefinitionsFromClasspathDiscoverySource(
@@ -41,7 +41,7 @@ class ScriptDefinitionsFromClasspathDiscoverySource(
     }
 }
 
-internal fun discoverScriptTemplatesInClasspath(
+fun discoverScriptTemplatesInClasspath(
     classpath: List<File>,
     baseClassLoader: ClassLoader,
     scriptResolverEnv: Map<String, Any?>,