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

Additional fix for CPP-12560: Structure view might freeze on update

Browse Source 
Use more convenient API to transfer finding element to bg

GitOrigin-RevId: 9584e9cdf012f4c0932974846fdeed8155d187ad
This commit is contained in:
Petr Kudriavtsev
2019-09-27 16:33:17 +00:00
committed by intellij-monorepo-bot
parent 691232ae60
commit 526cec5436
1 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java
+14 -34
View File
@@ -19,6 +19,8 @@ import com.intellij.ide.util.treeView.smartTree.*;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.FileEditorManager;
@@ -46,6 +48,7 @@ import com.intellij.ui.tree.TreeVisitor;
import com.intellij.ui.treeStructure.Tree;
import com.intellij.ui.treeStructure.filtered.FilteringTreeStructure;
import com.intellij.util.*;
import com.intellij.util.concurrency.AppExecutorUtil;
import com.intellij.util.containers.JBIterable;
import com.intellij.util.containers.JBTreeTraverser;
import com.intellij.util.ui.UIUtil;
@@ -476,40 +479,17 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre
ApplicationManager.getApplication().assertIsDispatchThread();
cancelScrollToSelectedElement();
if (isDisposed()) return;
final ProgressIndicatorBase newIndicator = new ProgressIndicatorBase();
myLastAutoscrollIndicator = newIndicator;
final ProgressIndicatorBase indicator = new ProgressIndicatorBase();
myLastAutoscrollIndicator = indicator;
PsiDocumentManager.getInstance(myProject).performWhenAllCommitted(
() -> scrollToSelectedElementLaterImpl(this::doFindSelectedElement, this::doScrollToSelectedElement, newIndicator)
);
}
// elementFinder is run off EDT
// elementSelector is run on EDT
private void scrollToSelectedElementLaterImpl(@NotNull Supplier<Object> elementFinder,
@NotNull Consumer<Object> elementSelector,
@NotNull ProgressIndicator indicator) {
ApplicationManager.getApplication().assertIsDispatchThread();
if (isDisposed() || indicator.isCanceled()) return;
ApplicationManager.getApplication().executeOnPooledThread(
ConcurrencyUtil.underThreadNameRunnable("StructureView: find selected element", () -> {
Ref<Object> selectedElement = Ref.create();
while (!ProgressIndicatorUtils.runInReadActionWithWriteActionPriority(() -> selectedElement.set(elementFinder.get()),
new SensitiveProgressWrapper(indicator))) {
if (isDisposed() || indicator.isCanceled()) return;
ProgressIndicatorUtils.yieldToPendingWriteActions();
if (isDisposed() || indicator.isCanceled()) return;
}
if (!selectedElement.isNull()) {
ApplicationManager.getApplication().invokeLater(() -> {
if (isDisposed() || indicator.isCanceled()) return;
elementSelector.consume(selectedElement.get());
});
}
}));
ReadAction.nonBlocking(this::doFindSelectedElement)
.withDocumentsCommitted(myProject)
.expireWhen(this::isDisposed)
.cancelWith(indicator)
.finishOnUiThread(ModalityState.current(), this::doScrollToSelectedElement)
.submit(AppExecutorUtil.getAppExecutorService());
}
@Nullable
@@ -522,8 +502,8 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre
return null;
}
private void doScrollToSelectedElement(@NotNull Object currentEditorElement) {
if (isDisposed()) return;
private void doScrollToSelectedElement(@Nullable Object currentEditorElement) {
if (currentEditorElement == null) return;
if (UIUtil.isFocusAncestor(this)) return;
select(currentEditorElement, false);
}