From 71262bdf14c57cc237f410a7311cfa7aaed8f291 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 23 Jun 2014 17:40:22 +0400
Subject: [PATCH] Output to the current directory by default ("-output .")

---
 .../cli/jvm/compiler/CompileEnvironmentUtil.java  |  5 +----
 .../jvm/compiler/KotlinToJVMBytecodeCompiler.java | 15 ++++++++-------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
index 67a98a0b7a4..0faf2ed84e6 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
@@ -278,11 +278,8 @@ public class CompileEnvironmentUtil {
         if (jar != null) {
             writeToJar(jar, includeRuntime, mainClass, outputFiles);
         }
-        else if (outputDir != null) {
-            OutputUtilsPackage.writeAll(outputFiles, outputDir, messageCollector);
-        }
         else {
-            throw new CompileEnvironmentException("Output directory or jar file is not specified - no files will be saved to the disk");
+            OutputUtilsPackage.writeAll(outputFiles, outputDir == null ? new File(".") : outputDir, messageCollector);
         }
     }
 
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
index 1053bd84883..fa78cac7e1d 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
@@ -22,6 +22,7 @@ import com.google.common.collect.Maps;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.psi.PsiFile;
+import com.intellij.util.ArrayUtil;
 import kotlin.Function0;
 import kotlin.Function1;
 import kotlin.Unit;
@@ -91,12 +92,12 @@ public class KotlinToJVMBytecodeCompiler {
     }
 
     private static void writeOutput(
-            CompilerConfiguration configuration,
-            ClassFileFactory outputFiles,
-            File outputDir,
-            File jarPath,
+            @NotNull CompilerConfiguration configuration,
+            @NotNull ClassFileFactory outputFiles,
+            @Nullable File outputDir,
+            @Nullable File jarPath,
             boolean jarRuntime,
-            FqName mainClass
+            @Nullable FqName mainClass
     ) {
         MessageCollector messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE);
         CompileEnvironmentUtil.writeOutputToDirOrJar(jarPath, outputDir, jarRuntime, mainClass, outputFiles, messageCollector);
@@ -192,7 +193,7 @@ public class KotlinToJVMBytecodeCompiler {
     }
 
     public static boolean compileBunchOfSources(
-            JetCoreEnvironment environment,
+            @NotNull JetCoreEnvironment environment,
             @Nullable File jar,
             @Nullable File outputDir,
             boolean includeRuntime
@@ -223,7 +224,7 @@ public class KotlinToJVMBytecodeCompiler {
         if (scriptClass == null) return;
 
         try {
-            scriptClass.getConstructor(String[].class).newInstance(new Object[]{scriptArgs.toArray(new String[scriptArgs.size()])});
+            scriptClass.getConstructor(String[].class).newInstance(new Object[] {ArrayUtil.toStringArray(scriptArgs)});
         }
         catch (RuntimeException e) {
             throw e;