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

restart async editor loading if the document is not committed (EA-93653 - assert: PsiDocumentManagerBase.commitDocument)

Browse Source
This commit is contained in:
peter
2017-05-08 09:27:43 +02:00
parent d40219dfb2
commit cac49fccf1
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/AsyncEditorLoader.java
+8 -2
View File
@@ -17,6 +17,7 @@ package com.intellij.openapi.fileEditor.impl.text;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileEditor.FileEditorStateLevel;
@@ -35,6 +36,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.*;
import java.util.function.BooleanSupplier;
public class AsyncEditorLoader {
private static final ExecutorService ourExecutor = AppExecutorUtil.createBoundedApplicationPoolExecutor("AsyncEditorLoader pool", 2);
@@ -88,7 +90,11 @@ public class AsyncEditorLoader {
private Future<Runnable> scheduleLoading() {
PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(myProject);
long startStamp = myEditor.getDocument().getModificationStamp();
Document document = myEditor.getDocument();
long startStamp = document.getModificationStamp();
BooleanSupplier psiDocumentRemainSame = () ->
startStamp == document.getModificationStamp() &&
psiDocumentManager.isCommitted(document); // undo after document change restores stamp but keeps PSI changed, hence additional check
return ourExecutor.submit(() -> {
Ref<Runnable> ref = new Ref<>();
try {
@@ -101,7 +107,7 @@ public class AsyncEditorLoader {
Runnable continuation = ref.get();
if (continuation != null) {
invokeLater(() -> {
if (startStamp == myEditor.getDocument().getModificationStamp()) loadingFinished(continuation);
if (psiDocumentRemainSame.getAsBoolean()) loadingFinished(continuation);
else if (!myProject.isDisposed() && !myEditorComponent.isDisposed()) scheduleLoading();
});
return continuation;