From 38b58db4f93eddb8a4ab674ac4099c6c4bb4b0eb Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 1 Feb 2016 19:16:31 +0100 Subject: [PATCH] don't apply StandardScriptDefinition in REPL --- .../cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt index 8d7adf55b9d..a32225cdced 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt @@ -119,13 +119,13 @@ open class K2JVMCompiler : CLICompiler() { configuration.put(JVMConfigurationKeys.MODULE_NAME, arguments.moduleName ?: JvmAbi.DEFAULT_MODULE_NAME) - configuration.add(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY, StandardScriptDefinition) - if (arguments.module == null && arguments.freeArgs.isEmpty() && !arguments.version) { ReplFromTerminal.run(rootDisposable, configuration) return ExitCode.OK } + configuration.add(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY, StandardScriptDefinition) + if (arguments.skipMetadataVersionCheck) { JvmMetadataVersion.skipCheck = true }