From a90f8122bda1b5aa1255e353980455a58787bd2c Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Fri, 22 Jan 2016 16:28:16 +0300
Subject: [PATCH] Fix NPE on trying to compile script files

(There is still no design)
---
 .../cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt   | 6 ++----
 .../integration/smoke/compileScript/script.expected         | 2 ++
 .../testData/integration/smoke/compileScript/script.kts     | 2 ++
 .../org/jetbrains/kotlin/integration/CompilerSmokeTest.java | 6 ++++++
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 compiler/testData/integration/smoke/compileScript/script.expected
 create mode 100644 compiler/testData/integration/smoke/compileScript/script.kts

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 81232f39d39..8d7adf55b9d 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
@@ -119,15 +119,13 @@ open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
 
         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
         }
 
-        if (arguments.script) {
-            configuration.add(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY, StandardScriptDefinition)
-        }
-
         if (arguments.skipMetadataVersionCheck) {
             JvmMetadataVersion.skipCheck = true
         }
diff --git a/compiler/testData/integration/smoke/compileScript/script.expected b/compiler/testData/integration/smoke/compileScript/script.expected
new file mode 100644
index 00000000000..bfa5da06582
--- /dev/null
+++ b/compiler/testData/integration/smoke/compileScript/script.expected
@@ -0,0 +1,2 @@
+
+Return code: 0
diff --git a/compiler/testData/integration/smoke/compileScript/script.kts b/compiler/testData/integration/smoke/compileScript/script.kts
new file mode 100644
index 00000000000..5ebd24ae082
--- /dev/null
+++ b/compiler/testData/integration/smoke/compileScript/script.kts
@@ -0,0 +1,2 @@
+1 + 1
+
diff --git a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java
index ddb78010012..2d4ebe46549 100644
--- a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java
@@ -64,4 +64,10 @@ public class CompilerSmokeTest extends CompilerSmokeTestBase {
     public void testScriptException() throws Exception {
         runCompiler("script", "-script", "script.kts");
     }
+
+    public void testCompileScript() throws Exception {
+        String jar = tmpdir.getAbsolutePath() + File.separator + "script.jar";
+
+        runCompiler("script", "script.kts", "-d", jar);
+    }
 }