Merge remote branch 'origin/master'

platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ExternalToolPass.java

@@ -32,6 +32,7 @@ import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.psi.FileViewProvider;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.containers.HashMap;
+import com.intellij.util.ui.update.Update;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
@@ -163,7 +164,18 @@ public class ExternalToolPass extends TextEditorHighlightingPass {
       r.run();
     }
     else {
-      myExternalToolPassFactory.scheduleExternalActivity(myFile, r);
+      myExternalToolPassFactory.scheduleExternalActivity(new Update(myFile) {
+        @Override
+        public void run() {
+          r.run();
+        }
+
+        @Override
+        public void setRejected() {
+          super.setRejected();
+          doFinish();
+        }
+      });
     }
   }
 

platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ExternalToolPassFactory.java

@@ -78,12 +78,7 @@ public class ExternalToolPassFactory extends AbstractProjectComponent implements
     return false;
   }
 
-  void scheduleExternalActivity(@NotNull PsiFile file, @NotNull final Runnable r) {
-    myExternalActivitiesQueue.queue(new Update(file) {
-      @Override
-      public void run() {
-        r.run();
-      }
-    });
-    }
+  void scheduleExternalActivity(@NotNull Update update) {
+    myExternalActivitiesQueue.queue(update);
+  }
 }