From 05f737cef220dc8aa79c521f186511cb1daaeb33 Mon Sep 17 00:00:00 2001
From: Sergey Simonchik <sergey.simonchik@jetbrains.com>
Date: Thu, 9 Jun 2016 15:21:16 +0300
Subject: [PATCH] reparse file on next EDT loop always to avoid potential
 locking in FileBasedIndexImpl (calling StorageGuard.enter#enter(true) and
 then StorageGuard.enter#enter(true) in stacktrace of the same thread leads to
 locking) (IDEA-CR-11333)

---
 .../src/com/intellij/psi/LanguageSubstitutors.java | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/platform/core-api/src/com/intellij/psi/LanguageSubstitutors.java b/platform/core-api/src/com/intellij/psi/LanguageSubstitutors.java
index 149ebc7b5e19..1dca825fd2da 100644
--- a/platform/core-api/src/com/intellij/psi/LanguageSubstitutors.java
+++ b/platform/core-api/src/com/intellij/psi/LanguageSubstitutors.java
@@ -70,7 +70,10 @@ public final class LanguageSubstitutors extends LanguageExtension<LanguageSubsti
         if (ApplicationManager.getApplication().isDispatchThread() && myReparsingInProgress) {
           return; // avoid recursive reparsing
         }
-        invokeLaterIfNeeded(new Runnable() {
+        if (ApplicationManager.getApplication().isUnitTestMode()) {
+          return;
+        }
+        ApplicationManager.getApplication().invokeLater(new Runnable() {
           @Override
           public void run() {
             LOG.info("Reparsing " + file.getPath() + " because of language substitution " +
@@ -99,13 +102,4 @@ public final class LanguageSubstitutors extends LanguageExtension<LanguageSubsti
     }
     return lang;
   }
-
-  private static void invokeLaterIfNeeded(@NotNull Runnable runnable, @NotNull ModalityState modalityState) {
-    if (ApplicationManager.getApplication().isDispatchThread()) {
-      runnable.run();
-    }
-    else if (!ApplicationManager.getApplication().isUnitTestMode()) {
-      ApplicationManager.getApplication().invokeLater(runnable, modalityState);
-    }
-  }
 }