Added support project settings in old kotlin2js compiler and made minor refactoring.

compiler/cli/cli-common/src/com/sampullara/cli/ArgumentUtils.java

@@ -16,6 +16,8 @@
 
 package com.sampullara.cli;
 
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.Function;
 import com.intellij.util.containers.ComparatorUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -66,12 +68,19 @@ public class ArgumentUtils {
                 name = Args.getName(argument, field);
             }
 
+            Class<?> fieldType = field.getType();
+
+            if (fieldType.isArray()) {
+                Object[] values = (Object[]) value;
+                if (values.length == 0) continue;
+                value = StringUtil.join(values, Function.TO_STRING, argument.delimiter());
+            }
+
             result.add(argument.prefix() + name);
 
-            Class<?> fieldType = field.getType();
-            if (fieldType != boolean.class && fieldType != Boolean.class) {
-                result.add(value.toString());
-            }
+            if (fieldType == boolean.class || fieldType == Boolean.class) continue;
+
+            result.add(value.toString());
         }
     }
 

compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java

@@ -189,14 +189,14 @@ public abstract class CLICompiler<A extends CommonCompilerArguments> {
             @NotNull MessageRenderer messageRenderer
     ) {
         if (arguments.printArgs) {
-            String freeArgs = StringUtil.join(arguments.freeArgs, " ");
+            String freeArgs = !arguments.freeArgs.isEmpty() ? " " + StringUtil.join(arguments.freeArgs, " ") : "";
 
             List<String> argumentsAsList = ArgumentUtils.convertArgumentsToStringList(arguments, createArguments());
             String argumentsAsString = StringUtil.join(argumentsAsList, " ");
 
             String printArgsMessage = messageRenderer.render(CompilerMessageSeverity.INFO,
                                                              "Invoking compiler " + getClass().getName() +
-                                                             " with arguments " + argumentsAsString + " " + freeArgs,
+                                                             " with arguments " + argumentsAsString + freeArgs,
                                                              CompilerMessageLocation.NO_LOCATION);
             errStream.println(printArgsMessage);
         }

compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java

@@ -93,17 +93,17 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
             reportCompiledSourcesList(messageCollector, environmentForJS);
         }
 
-        Config config = getConfig(arguments, project);
-        if (analyzeAndReportErrors(messageCollector, environmentForJS.getSourceFiles(), config)) {
-            return COMPILATION_ERROR;
-        }
-
         String outputFile = arguments.outputFile;
         if (outputFile == null) {
             messageCollector.report(CompilerMessageSeverity.ERROR, "Specify output file via -output", CompilerMessageLocation.NO_LOCATION);
             return ExitCode.INTERNAL_ERROR;
         }
 
+        Config config = getConfig(arguments, project);
+        if (analyzeAndReportErrors(messageCollector, environmentForJS.getSourceFiles(), config)) {
+            return COMPILATION_ERROR;
+        }
+
         MainCallParameters mainCallParameters = createMainCallParameters(arguments.main);
         return translateAndGenerateOutputFile(mainCallParameters, environmentForJS, config, outputFile);
     }