From 807cf1dcc08df8226cd87b08b177ba77c04a321f Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 11 Aug 2014 18:27:37 +0400
Subject: [PATCH] Don't pass "-verbose" by default to compiler in IDE

Let user pass it in the settings. Currently doesn't affect anything since
apparently no verbose messages appear in the IDE compiler output
---
 .../jet/compiler/runner/KotlinCompilerRunner.java   | 13 +------------
 .../jetbrains/jet/jps/build/KotlinJpsBuildTest.java |  5 +++++
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java
index c4f47b10201..842288685e1 100644
--- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java
+++ b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java
@@ -130,16 +130,7 @@ public class KotlinCompilerRunner {
         return copy;
     }
 
-    private static void setupCommonSettings(CommonCompilerArguments settings) {
-        settings.verbose = true;
-    }
-
-    private static void setupK2JvmArguments(
-            File moduleFile,
-            K2JVMCompilerArguments settings
-    ) {
-        setupCommonSettings(settings);
-
+    private static void setupK2JvmArguments(File moduleFile, K2JVMCompilerArguments settings) {
         settings.module = moduleFile.getAbsolutePath();
         settings.noStdlib = true;
         settings.noJdkAnnotations = true;
@@ -152,8 +143,6 @@ public class KotlinCompilerRunner {
             List<String> libraryFiles,
             K2JSCompilerArguments settings
     ) {
-        setupCommonSettings(settings);
-
         settings.freeArgs = ContainerUtil.map(sourceFiles, new Function<File, String>() {
             @Override
             public String fun(File file) {
diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java
index 842ad2a83aa..2f108a570d5 100644
--- a/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java
+++ b/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java
@@ -23,6 +23,8 @@ import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.codegen.AsmUtil;
+import org.jetbrains.jet.compiler.CompilerSettings;
+import org.jetbrains.jet.jps.JpsKotlinCompilerSettings;
 import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jps.builders.BuildResult;
@@ -69,6 +71,9 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase {
     private void initProject() {
         addJdk(JDK_NAME);
         loadProject(workDir.getAbsolutePath() + File.separator + PROJECT_NAME + ".ipr");
+        CompilerSettings settings = new CompilerSettings();
+        settings.setAdditionalArguments(settings.getAdditionalArguments() + " -verbose");
+        JpsKotlinCompilerSettings.setCompilerSettings(myProject, settings);
     }
 
     public void doTest() {