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

async structure view: employ ATM fixes and turn tests back ON

Browse Source
This commit is contained in:
Gregory.Shrago
2017-10-10 19:40:43 +03:00
parent 31fe10e3ef
commit 53ae3a88ab
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java
+4 -15
View File
@@ -57,7 +57,6 @@ import com.intellij.ui.treeStructure.filtered.FilteringTreeStructure;
import com.intellij.util.*;
import com.intellij.util.containers.JBIterable;
import com.intellij.util.containers.JBTreeTraverser;
import com.intellij.util.ui.EdtInvocationManager;
import com.intellij.util.ui.UIUtil;
import com.intellij.util.ui.tree.TreeModelAdapter;
import com.intellij.util.ui.tree.TreeUtil;
@@ -85,14 +84,13 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
public class StructureViewComponent extends SimpleToolWindowPanel implements TreeActionsOwner, DataProvider, StructureView.Scrollable {
private static final Logger LOG = Logger.getInstance("#com.intellij.ide.structureView.newStructureView.StructureViewComponent");
private static final Key<TreeState> STRUCTURE_VIEW_STATE_KEY = Key.create("STRUCTURE_VIEW_STATE");
private static AtomicInteger ourSettingsModificationCount = new AtomicInteger();
private final boolean myUseATM = !ApplicationManager.getApplication().isUnitTestMode() &&
private final boolean myUseATM = ApplicationManager.getApplication().isUnitTestMode() ||
Experiments.isFeatureEnabled("structure.view.async.tree.model");
private FileEditor myFileEditor;
@@ -139,10 +137,7 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre
if (isDisposed()) return;
super.rebuildTree();
if (myUseATM) {
myStructureTreeModel.invalidate().processed(ignored -> {
// todo restoreState??
//UIUtil.invokeLaterIfNeeded(StructureViewComponent.this::restoreState);
});
myStructureTreeModel.invalidate();
}
}
@@ -286,7 +281,6 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre
public void rebuild() {
if (myUseATM) {
//storeState();
myStructureTreeModel.getInvoker().invokeLaterIfNeeded(myTreeStructure::rebuildTree);
}
else {
@@ -757,13 +751,8 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre
if (o instanceof AbstractTreeNode) ((AbstractTreeNode)o).update();
return TreeVisitor.Action.CONTINUE;
};
AtomicReference<Consumer<TreePath>> thisRef = new AtomicReference<>();
Consumer<TreePath> consumer = ignore -> EdtInvocationManager.getInstance().invokeLater(() -> {
if (myAsyncTreeModel.isProcessing()) myAsyncTreeModel.accept(visitor).processed(thisRef.get());
else result.setResult(null);
});
thisRef.set(consumer);
myStructureTreeModel.getInvoker().invokeLaterIfNeeded(() -> consumer.consume(null));
myStructureTreeModel.getInvoker().invokeLater(() ->
myAsyncTreeModel.accept(visitor).processed(ignore -> result.setResult(null)));
return result;
}