From deb76d7c0fc4e7b49bb80631293322b2e12fc5e9 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 7 Jun 2018 12:35:19 +0300
Subject: [PATCH] Revert: run all-docs-committed handlers when PSI is absent
 (assert-EDT exceptions)

---
 .../psi/impl/PsiDocumentManagerBase.java        |  3 ---
 .../psi/impl/PsiDocumentManagerImplTest.java    | 17 -----------------
 2 files changed, 20 deletions(-)

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 a60c719f8219..fbbe79567290 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java
@@ -428,7 +428,6 @@ public abstract class PsiDocumentManagerBase extends PsiDocumentManager implemen
     final PsiFile psiFile = getPsiFile(document);
     if (psiFile == null) {
       myUncommittedDocuments.remove(document);
-      runAfterCommitActions(document);
       return; // the project must be closing or file deleted
     }
 
@@ -863,13 +862,11 @@ public abstract class PsiDocumentManagerBase extends PsiDocumentManager implemen
 
     VirtualFile virtualFile = FileDocumentManager.getInstance().getFile(document);
     if (virtualFile == null || !FileIndexFacade.getInstance(myProject).isInContent(virtualFile)) {
-      runAfterCommitActions(document);
       return;
     }
 
     final PsiFile psiFile = getPsiFile(document);
     if (psiFile == null) {
-      runAfterCommitActions(document);
       return;
     }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/psi/impl/PsiDocumentManagerImplTest.java b/platform/platform-tests/testSrc/com/intellij/psi/impl/PsiDocumentManagerImplTest.java
index 308aa6045470..662a3abf0627 100644
--- a/platform/platform-tests/testSrc/com/intellij/psi/impl/PsiDocumentManagerImplTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/psi/impl/PsiDocumentManagerImplTest.java
@@ -22,7 +22,6 @@ import com.intellij.mock.MockPsiFile;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.application.TransactionGuard;
-import com.intellij.openapi.application.WriteAction;
 import com.intellij.openapi.application.impl.LaterInvocator;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.editor.Document;
@@ -82,7 +81,6 @@ import java.util.Collections;
 import java.util.Random;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class PsiDocumentManagerImplTest extends PlatformTestCase {
@@ -757,21 +755,6 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase {
     assertTrue(PsiDocumentManager.getInstance(myProject).isCommitted(document));
   }
 
-  public void testPerformWhenAllCommittedWorksAfterFileDeletion() throws Exception {
-    PsiFile file = getPsiManager().findFile(getVirtualFile(createTempFile("X.txt", "")));
-    Document document = file.getViewProvider().getDocument();
-    assertNotNull(document);
-
-    AtomicBoolean invoked = new AtomicBoolean();
-    WriteAction.run(() -> {
-      document.setText("class A{}");
-      PsiDocumentManager.getInstance(myProject).performWhenAllCommitted(() -> invoked.set(true));
-      file.getVirtualFile().delete(this);
-    });
-    PsiDocumentManager.getInstance(myProject).commitAllDocuments();
-    assertTrue(invoked.get());
-  }
-
   @SuppressWarnings("ConstantConditions")
   public void testPerformLaterWhenAllCommittedFromCommitHandler() throws Exception {
     Document document = createDocument();