MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert: run all-docs-committed handlers when PSI is absent (assert-EDT exceptions)

Browse Source
This commit is contained in:
Alexey Kudravtsev
2018-06-07 12:36:53 +03:00
parent 65cebe30a5
commit deb76d7c0f
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java
-3
View File
@@ -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;
}
platform/platform-tests/testSrc/com/intellij/psi/impl/PsiDocumentManagerImplTest.java
-17
View File
@@ -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();