diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java index 7f15b69f7f72..c6b4d0ffb12d 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java @@ -343,6 +343,8 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF } private void scheduleDropCachesWithInvalidStubPsi() { + // invokeLater even if already on EDT, because + // we might be inside an index query and write actions might result in deadlocks there (http://youtrack.jetbrains.com/issue/IDEA-123118) ApplicationManager.getApplication().invokeLater(new Runnable() { @Override public void run() {