Process imports in background thread

Author: auduchinok

src/com/goide/codeInsight/imports/GoOptimizeImportsPass.java

@@ -18,15 +18,19 @@
 
 import com.intellij.codeInsight.daemon.impl.DefaultHighlightInfoProcessor;
 import com.intellij.codeInsight.daemon.impl.ProgressableTextEditorHighlightingPass;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.command.undo.UndoManager;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.DocumentUtil;
 import org.jetbrains.annotations.NotNull;
 
 public class GoOptimizeImportsPass extends ProgressableTextEditorHighlightingPass {
   @NotNull private final PsiFile myFile;
+  private Runnable myRunnableFix;
 
   public GoOptimizeImportsPass(@NotNull Project project, @NotNull PsiFile file, @NotNull Editor editor) {
     super(project, editor.getDocument(), "Go Optimize Imports Pass", file, editor, file.getTextRange(), false,
@@ -36,12 +40,23 @@ public GoOptimizeImportsPass(@NotNull Project project, @NotNull PsiFile file, @N
 
   @Override
   protected void collectInformationWithProgress(@NotNull ProgressIndicator progress) {
+    myRunnableFix = new GoImportOptimizer().processFile(myFile);
     progress.checkCanceled();
   }
 
   @Override
   protected void applyInformationWithProgress() {
-    final Runnable runnable = new GoImportOptimizer().processFile(myFile);
-    DocumentUtil.writeInRunUndoTransparentAction(runnable);
+    final Project project = myFile.getProject();
+    if (PsiDocumentManager.getInstance(project).getDocument(myFile) == null) return;
+    ApplicationManager.getApplication().invokeLater(new Runnable() {
+      @Override
+      public void run() {
+        if (project.isDisposed()) return;
+        UndoManager undoManager = UndoManager.getInstance(project);
+        if (undoManager.isUndoInProgress() || undoManager.isRedoInProgress()) return;
+        PsiDocumentManager.getInstance(project).commitAllDocuments();
+        DocumentUtil.writeInRunUndoTransparentAction(myRunnableFix);
+      }
+    });
   }
 }

tests/com/goide/inspections/GoTestSignaturesInspectionTest.java

@@ -21,12 +21,6 @@
 import com.intellij.testFramework.LightProjectDescriptor;
 
 public class GoTestSignaturesInspectionTest extends GoQuickFixTestBase {
-  @Override
-  protected void tearDown() throws Exception {
-    GoCodeInsightSettings.getInstance().setOptimizeImportsOnTheFly(true);
-    super.tearDown();
-  }
-
   @Override
   protected void setUp() throws Exception {
     super.setUp();
@@ -35,6 +29,12 @@ protected void setUp() throws Exception {
     GoCodeInsightSettings.getInstance().setOptimizeImportsOnTheFly(false);
   }
 
+  @Override
+  protected void tearDown() throws Exception {
+    GoCodeInsightSettings.getInstance().setOptimizeImportsOnTheFly(true);
+    super.tearDown();
+  }
+
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
     return createMockProjectDescriptor();