Skip to content

Fix race condition in FilteredItemsSelectionDialog initial selection #3547

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −7
Draft

Fix race condition in FilteredItemsSelectionDialog initial selection #3547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions ...g.eclipse.ui.workbench/eclipseui/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,12 +879,24 @@ public void refresh() {
lastRefreshSelection = prepareInitialSelection(lastRefreshSelection);
}
// preserve previous selection
if (refreshWithLastSelection && lastRefreshSelection != null && lastRefreshSelection.size() > 0) {
tableViewer.setSelection(new StructuredSelection(lastRefreshSelection));
// Apply selection asynchronously to ensure table refresh has completed
// This fixes race condition where setSelection() is called before
// tableViewer.refresh() has fully updated the table items
final List<Object> selectionToApply = lastRefreshSelection;
if (refreshWithLastSelection && selectionToApply != null && selectionToApply.size() > 0) {
tableViewer.getTable().getDisplay().asyncExec(() -> {
if (!tableViewer.getTable().isDisposed()) {
tableViewer.setSelection(new StructuredSelection(selectionToApply));
}
});
} else {
refreshWithLastSelection = true;
tableViewer.getTable().setSelection(0);
tableViewer.getTable().notifyListeners(SWT.Selection, new Event());
tableViewer.getTable().getDisplay().asyncExec(() -> {
if (!tableViewer.getTable().isDisposed()) {
tableViewer.getTable().setSelection(0);
tableViewer.getTable().notifyListeners(SWT.Selection, new Event());
}
});
}
} else {
tableViewer.setSelection(StructuredSelection.EMPTY);
Expand Down
5 changes: 2 additions & 3 deletions ....ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceInitialSelectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,9 +471,8 @@ private void waitForDialogRefresh() {
});

// Then wait additional time for selection to be applied
// The selection is set asynchronously after table population completes
// Previous fix used only 3 × 50ms = 150ms which was insufficient on slow systems
// Increased to handle slower machines while minimizing delay on fast ones
// FilteredItemsSelectionDialog.refresh() now uses Display.asyncExec() to apply
// selection after table refresh completes, so we need to process those async events
for (int i = 0; i < 5; i++) {
processUIEvents();
try {
Expand Down
Loading