From 7702274633267a31176eb4142cc43449e9635579 Mon Sep 17 00:00:00 2001
From: "Natalia.Ukhorskaya" <natalia.ukhorskaya@jetbrains.com>
Date: Mon, 18 Mar 2013 15:50:49 +0400
Subject: [PATCH] Optimize imports when insert new import (optimize imports on
 the fly should be turned on)  #KT-3403 Fixed

---
 .../plugin/quickfix/ImportInsertHelper.java   |  6 ++
 .../onFly/OptimizeImportsOnFly.kt             |  1 +
 .../onFly/OptimizeImportsOnFly.kt.after       |  1 +
 .../OptimizeImportsOnFlyTest.java             | 57 +++++++++++++++++++
 4 files changed, 65 insertions(+)
 create mode 100644 idea/testData/editor/optimizeImports/onFly/OptimizeImportsOnFly.kt
 create mode 100644 idea/testData/editor/optimizeImports/onFly/OptimizeImportsOnFly.kt.after
 create mode 100644 idea/tests/org/jetbrains/jet/plugin/importOptimizer/OptimizeImportsOnFlyTest.java

diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java
index 3bef16e760e..4e40691e773 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java
@@ -16,6 +16,8 @@
 
 package org.jetbrains.jet.plugin.quickfix;
 
+import com.intellij.codeInsight.CodeInsightSettings;
+import com.intellij.codeInsight.actions.OptimizeImportsProcessor;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
@@ -112,6 +114,10 @@ public class ImportInsertHelper {
     }
 
     public static void addImportDirectiveIfNeeded(@NotNull ImportPath importPath, @NotNull JetFile file) {
+        if (CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY) {
+            new OptimizeImportsProcessor(file.getProject(), file).runWithoutProgress();
+        }
+
         if (!doNeedImport(importPath, file)) {
             return;
         }
diff --git a/idea/testData/editor/optimizeImports/onFly/OptimizeImportsOnFly.kt b/idea/testData/editor/optimizeImports/onFly/OptimizeImportsOnFly.kt
new file mode 100644
index 00000000000..9596157ef46
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/onFly/OptimizeImportsOnFly.kt
@@ -0,0 +1 @@
+import java.util.ArrayList
\ No newline at end of file
diff --git a/idea/testData/editor/optimizeImports/onFly/OptimizeImportsOnFly.kt.after b/idea/testData/editor/optimizeImports/onFly/OptimizeImportsOnFly.kt.after
new file mode 100644
index 00000000000..e4931c7e313
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/onFly/OptimizeImportsOnFly.kt.after
@@ -0,0 +1 @@
+import java.util.HashSet
diff --git a/idea/tests/org/jetbrains/jet/plugin/importOptimizer/OptimizeImportsOnFlyTest.java b/idea/tests/org/jetbrains/jet/plugin/importOptimizer/OptimizeImportsOnFlyTest.java
new file mode 100644
index 00000000000..d3ab1fb2628
--- /dev/null
+++ b/idea/tests/org/jetbrains/jet/plugin/importOptimizer/OptimizeImportsOnFlyTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.plugin.importOptimizer;
+
+import com.intellij.codeInsight.CodeInsightSettings;
+import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase;
+import com.intellij.openapi.application.ApplicationManager;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.resolve.name.FqName;
+import org.jetbrains.jet.plugin.PluginTestCaseBase;
+import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper;
+
+public class OptimizeImportsOnFlyTest extends LightDaemonAnalyzerTestCase {
+
+    public void testOptimizeImportsOnFly() {
+        doTest("java.util.HashSet");
+    }
+
+    public void doTest(final String importString) {
+        configureByFile(getTestName(false) + ".kt");
+        boolean oldValue = CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY;
+        try {
+            CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY = true;
+            ApplicationManager.getApplication().runWriteAction(new Runnable() {
+                @Override
+                public void run() {
+                    ImportInsertHelper.addImportDirectiveIfNeeded(new FqName(importString), (JetFile) getFile());
+                }
+            });
+        }
+        finally {
+            CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY = oldValue;
+        }
+        checkResultByFile(getTestName(false) + ".kt.after");
+    }
+
+    @NotNull
+    @Override
+    protected String getTestDataPath() {
+        return PluginTestCaseBase.getTestDataPathBase() + "/editor/optimizeImports/onFly/";
+    }
+}
\ No newline at end of file