From 82a2a705fb10f83f0471bcaca013da0dbb3432e3 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Tue, 24 Jan 2017 18:21:56 +0300
Subject: [PATCH] Do not wrap analyze into write action priority in tests

In tests the code is executed in EDT and runInReadActionWithWriteActionPriority fails

See: MergingUpdateQueue.setPassThrough() and ExternalToolPassFactory() constructor
---
 .../klint/AndroidLintExternalAnnotator.java   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidLintExternalAnnotator.java b/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidLintExternalAnnotator.java
index b244a9c1953..d00ebe52ea0 100644
--- a/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidLintExternalAnnotator.java
+++ b/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidLintExternalAnnotator.java
@@ -19,6 +19,7 @@ import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.lang.annotation.ExternalAnnotator;
 import com.intellij.lang.annotation.HighlightSeverity;
 import com.intellij.openapi.actionSystem.IdeActions;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypes;
@@ -58,6 +59,7 @@ import static com.android.tools.klint.detector.api.TextFormat.RAW;
 
 public class AndroidLintExternalAnnotator extends ExternalAnnotator<State, State> {
   static final boolean INCLUDE_IDEA_SUPPRESS_ACTIONS = false;
+  static final boolean IS_UNIT_TEST_MODE = ApplicationManager.getApplication().isUnitTestMode();
 
   @Nullable
   @Override
@@ -139,12 +141,17 @@ public class AndroidLintExternalAnnotator extends ExternalAnnotator<State, State
               client, project, files, Collections.singletonList(state.getModule()), true /* incremental */);
       request.setScope(scope);
 
-      ProgressIndicatorUtils.runInReadActionWithWriteActionPriority(new Runnable() {
-        @Override
-        public void run() {
-          lint.analyze(request);
-        }
-      });
+      if (!IS_UNIT_TEST_MODE) {
+        ProgressIndicatorUtils.runInReadActionWithWriteActionPriority(new Runnable() {
+          @Override
+          public void run() {
+            lint.analyze(request);
+          }
+        });
+      }
+      else {
+        lint.analyze(request);
+      }
     }
     finally {
       Disposer.dispose(client);