azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ScriptingCompilerPluginTest after creating a separate jar with shared plugin code

Browse Source
This commit is contained in:
Ilya Chernikov
2019-03-23 09:52:02 +01:00
parent 636ed025da
commit 99a5885aa7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt
+5 -2
View File
@@ -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.compiler.KotlinToJVMBytecodeCompiler
import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots 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.CompilerConfiguration
import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.config.JVMConfigurationKeys
import org.jetbrains.kotlin.scripting.shared.definitions.SCRIPT_DEFINITION_MARKERS_PATH import org.jetbrains.kotlin.scripting.shared.definitions.SCRIPT_DEFINITION_MARKERS_PATH
@@ -35,7 +37,7 @@ import java.io.File
class ScriptingCompilerPluginTest : TestCaseWithTmpdir() { class ScriptingCompilerPluginTest : TestCaseWithTmpdir() {
companion object { 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) { private val kotlinPaths: KotlinPaths by lazy(LazyThreadSafetyMode.PUBLICATION) {
@@ -57,6 +59,7 @@ class ScriptingCompilerPluginTest : TestCaseWithTmpdir() {
put(JVMConfigurationKeys.OUTPUT_DIRECTORY, destDir) put(JVMConfigurationKeys.OUTPUT_DIRECTORY, destDir)
confBody() confBody()
} }
configuration.add(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS, ScriptingCompilerConfigurationComponentRegistrar())
return KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) return KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
} }
@@ -69,7 +72,7 @@ class ScriptingCompilerPluginTest : TestCaseWithTmpdir() {
val configuration = CompilerConfiguration() val configuration = CompilerConfiguration()
cmdlineProcessor.processOption( cmdlineProcessor.processOption(
ScriptingCommandLineProcessor.LEGACY_SCRIPT_RESOLVER_ENVIRONMENT_OPTION, ScriptingCommandLineProcessor.LEGACY_SCRIPT_RESOLVER_ENVIRONMENT_OPTION as AbstractCliOption,
"""abc=def,11="ab cd \\ \"",long="$longStr"""", """abc=def,11="ab cd \\ \"",long="$longStr"""",
configuration configuration
) )
plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt
+2 -2
View File
@@ -22,7 +22,7 @@ import kotlin.script.experimental.host.createCompilationConfigurationFromTemplat
import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
import kotlin.script.templates.ScriptTemplateDefinition 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" internal const val SCRIPT_DEFINITION_MARKERS_EXTENSION_WITH_DOT = ".classname"
class ScriptDefinitionsFromClasspathDiscoverySource( class ScriptDefinitionsFromClasspathDiscoverySource(
@@ -41,7 +41,7 @@ class ScriptDefinitionsFromClasspathDiscoverySource(
} }
} }
internal fun discoverScriptTemplatesInClasspath( fun discoverScriptTemplatesInClasspath(
classpath: List<File>, classpath: List<File>,
baseClassLoader: ClassLoader, baseClassLoader: ClassLoader,
scriptResolverEnv: Map<String, Any?>, scriptResolverEnv: Map<String, Any?>,