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

NonBlockingReadActionImpl: use earlyDisposable only on light projects

Browse Source 
GitOrigin-RevId: 55e7b21a3de95344301f62ad5ba2373e1bd87e2f
This commit is contained in:
Peter Gromov
2020-06-10 22:26:34 +03:00
committed by intellij-monorepo-bot
parent a242a3c580
commit 4d1abd260f
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/application/impl/NonBlockingReadActionImpl.java
+7 -18
View File
@@ -14,7 +14,6 @@ import com.intellij.openapi.application.constraints.BaseConstrainedExecution;
import com.intellij.openapi.application.constraints.ConstrainedExecution.ContextConstraint;
import com.intellij.openapi.application.ex.ApplicationEx;
import com.intellij.openapi.application.ex.ApplicationManagerEx;
import com.intellij.openapi.components.ComponentManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
@@ -25,6 +24,8 @@ import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressIndicatorProvider;
import com.intellij.openapi.progress.util.ProgressIndicatorUtils;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ex.ProjectEx;
import com.intellij.openapi.project.impl.ProjectImpl;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.Ref;
@@ -105,12 +106,12 @@ public class NonBlockingReadActionImpl<T> implements NonBlockingReadAction<T> {
@Override
public NonBlockingReadAction<T> inSmartMode(@NotNull Project project) {
return withConstraint(new InSmartMode(project)).expireWithRWCompliantParent(project);
return withConstraint(new InSmartMode(project)).expireWith(project);
}
@Override
public NonBlockingReadAction<T> withDocumentsCommitted(@NotNull Project project) {
return withConstraint(new WithDocumentsCommitted(project, ModalityState.any())).expireWithRWCompliantParent(project);
return withConstraint(new WithDocumentsCommitted(project, ModalityState.any())).expireWith(project);
}
@Override
@@ -123,25 +124,12 @@ public class NonBlockingReadActionImpl<T> implements NonBlockingReadAction<T> {
@NotNull
@Override
public NonBlockingReadAction<T> expireWith(@NotNull Disposable parentDisposable) {
if (parentDisposable instanceof ComponentManager) {
return expireWithRWCompliantParent((ComponentManager)parentDisposable);
}
Set<Disposable> disposables = new HashSet<>();
disposables.add(parentDisposable);
return new NonBlockingReadActionImpl<>(myComputation, myEdtFinish, myConstraints, myCancellationConditions, disposables,
myCoalesceEquality, myProgressIndicator);
}
/**
* App/projects/modules are always disposed in a write action,
* so checking them at computation/finish start is enough
* and allows to avoid querying Disposer, which isn't free.
*/
@NotNull
private NonBlockingReadAction<T> expireWithRWCompliantParent(@NotNull ComponentManager parent) {
return expireWhen(() -> parent.isDisposed());
}
@Override
public NonBlockingReadAction<T> wrapProgress(@NotNull ProgressIndicator progressIndicator) {
LOG.assertTrue(myProgressIndicator == null, "Unspecified behaviour. Outer progress indicator is already set for the action.");
@@ -234,7 +222,7 @@ public class NonBlockingReadActionImpl<T> implements NonBlockingReadAction<T> {
ourTasks.add(this);
}
for (Disposable parent : myDisposables) {
if (Disposer.isDisposed(parent)) {
if (parent instanceof Project ? ((Project)parent).isDisposed() : Disposer.isDisposed(parent)) {
cancel();
break;
}
@@ -244,7 +232,8 @@ public class NonBlockingReadActionImpl<T> implements NonBlockingReadAction<T> {
cancel();
}
};
Disposer.register(parent, child);
//noinspection TestOnlyProblems
Disposer.register(parent instanceof ProjectImpl && ((ProjectEx)parent).isLight() ? ((ProjectImpl)parent).getEarlyDisposable() : parent, child);
myExpirationDisposables.add(child);
}
}