From 16ce25e18d5e530741b4ae5c5621e5420eeca815 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 7 Nov 2016 08:16:11 +0100
Subject: [PATCH] handle project closing during commitAndRunReadAction

---
 .../src/com/intellij/psi/impl/PsiDocumentManagerBase.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java b/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java
index 2ac0a6c9194c..a16eb4c8bd1e 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java
@@ -516,6 +516,12 @@ public abstract class PsiDocumentManagerBase extends PsiDocumentManager implemen
       application.invokeLater(new Runnable() {
         @Override
         public void run() {
+          if (myProject.isDisposed()) {
+            // committedness doesn't matter anymore; give clients a chance to do checkCanceled
+            semaphore.up();
+            return;
+          }
+
           performWhenAllCommitted(new Runnable() {
             @Override
             public void run() {
-- 
2.32.0