Skip to content

Avoid the full ancestor chain walk when removing elements from the Project Explorer #4260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vogella wants to merge 2 commits into
base: master
Choose a base branch
from
+17 −2
Open

Avoid the full ancestor chain walk when removing elements from the Project Explorer #4260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ffc54b
Fix pipelined parent lookup in NavigatorContentServiceContentProvider
vogella Aug 20, 2026
6034db8
Avoid full ancestor chain walk when removing elements from CommonViewer
vogella Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...vigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceContentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ public void run() throws Exception {
overridingExtensions = foundExtension
.getOverridingExtensionsForPossibleChild(anElement);
if (overridingExtensions.length > 0) {
parent[0] = pipelineParent(anElement, overridingExtensions, parent);
parent[0] = pipelineParent(anElement, overridingExtensions, parent[0]);
}
}
}
Expand Down Expand Up @@ -354,7 +354,7 @@ private Object pipelineParent(Object anInputElement, NavigatorContentExtension[]
Object theCurrentParent) {
IPipelinedTreeContentProvider pipelinedContentProvider;
NavigatorContentExtension[] overridingExtensions;
Object aSuggestedParent = null;
Object aSuggestedParent = theCurrentParent;
for (NavigatorContentExtension theOverridingExtension : theOverridingExtensions) {

if (theOverridingExtension.internalGetContentProvider().isPipelined()) {
Expand Down
15 changes: 15 additions & 0 deletions bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.LabelProviderChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.viewers.ViewerSorter;
Expand All @@ -39,6 +40,7 @@
import org.eclipse.ui.internal.navigator.CommonNavigatorFrameSource;
import org.eclipse.ui.internal.navigator.ContributorTrackingSet;
import org.eclipse.ui.internal.navigator.NavigatorContentService;
import org.eclipse.ui.internal.navigator.NavigatorContentServiceContentProvider;
import org.eclipse.ui.internal.navigator.NavigatorDecoratingLabelProvider;
import org.eclipse.ui.internal.navigator.NavigatorPipelineService;
import org.eclipse.ui.internal.navigator.dnd.NavigatorDnDService;
Expand Down Expand Up @@ -242,6 +244,19 @@ protected void handleLabelProviderChanged(LabelProviderChangedEvent event) {
super.handleLabelProviderChanged(event);
}

@Override
protected Object getParentElement(Object elementOrTreePath) {
if (!(elementOrTreePath instanceof TreePath)
&& getContentProvider() instanceof NavigatorContentServiceContentProvider provider) {
// getParents() compiles the whole ancestor chain although only the immediate parent is used
Object parent = provider.getParent(elementOrTreePath);
if (parent != null) {
return parent;
}
}
return super.getParentElement(elementOrTreePath);
}

@Override
protected void handleDispose(DisposeEvent event) {
dispose();
Expand Down
Loading