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

Implement property for passing argumens to isolated script compiler

Browse Source
This commit is contained in:
Ilya Chernikov
2021-01-07 20:33:14 +01:00
parent 43d7536a28
commit e9da385f7c
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/compilationContext.kt
+8
View File
@@ -54,6 +54,8 @@ import kotlin.script.experimental.jvm.jvm
import kotlin.script.experimental.jvm.util.KotlinJars import kotlin.script.experimental.jvm.util.KotlinJars
import kotlin.script.experimental.jvm.withUpdatedClasspath import kotlin.script.experimental.jvm.withUpdatedClasspath
const val SCRIPT_BASE_COMPILER_ARGUMENTS_PROPERTY = "kotlin.script.base.compiler.arguments"
class SharedScriptCompilationContext( class SharedScriptCompilationContext(
val disposable: Disposable?, val disposable: Disposable?,
val baseScriptCompilationConfiguration: ScriptCompilationConfiguration, val baseScriptCompilationConfiguration: ScriptCompilationConfiguration,
@@ -140,7 +142,13 @@ internal fun createInitialConfigurations(
createInitialCompilerConfiguration( createInitialCompilerConfiguration(
scriptCompilationConfiguration, hostConfiguration, messageCollector, ignoredOptionsReportingState scriptCompilationConfiguration, hostConfiguration, messageCollector, ignoredOptionsReportingState
) )
// TODO: replace the default when ready
kotlinCompilerConfiguration.put(JVMConfigurationKeys.IR, false) kotlinCompilerConfiguration.put(JVMConfigurationKeys.IR, false)
System.getProperty(SCRIPT_BASE_COMPILER_ARGUMENTS_PROPERTY)?.takeIf { it.isNotBlank() }?.split(' ')?.let {
kotlinCompilerConfiguration.updateWithCompilerOptions(it)
}
val initialScriptCompilationConfiguration = val initialScriptCompilationConfiguration =
scriptCompilationConfiguration.withUpdatesFromCompilerConfiguration(kotlinCompilerConfiguration) scriptCompilationConfiguration.withUpdatesFromCompilerConfiguration(kotlinCompilerConfiguration)