Apply Quick Access results by request state instead of last job

QuickAccessContents.updateProposals applied a compute job's results only
when it was still the last scheduled job (computeProposalsJob ==
currentComputeEntriesJob). A shell resize schedules another updateProposals
right after a compute finishes, so the still-valid results of the finished
job were discarded, and the newer job was then cancelled by the following
resize before it rendered anything. The table stayed empty, which is the
intermittent failure in
QuickAccessDialogTest.testPreviousChoicesAvailableForExtension.

In addition, the modify listener passed the raw filter text while the resize
and show-all listeners passed a lower-cased one, so a single UI state
produced two competing jobs and only the lower-cased one matched (the matcher
requires a lower-cased filter).

Normalize the filter to lower case once in updateProposals so all callers
share one filter string, and apply a finished job's results when they still
match the current request state (filter text and show-all) instead of when
the job happens to be the last scheduled one. A valid result is no longer
dropped because a later recompute was scheduled, while a result for a filter
the user has since changed is still rejected.

Addresses #4009

Author: vogella

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java

@@ -147,9 +147,12 @@ private int computeNumberOfItems() {
 	/**
 	 * Refreshes the contents of the quick access shell
 	 *
-	 * @param filter The filter text to apply to results
+	 * @param filterInput The filter text to apply to results
 	 */
-	public void updateProposals(String filter) {
+	public void updateProposals(String filterInput) {
+		// Lower-case once so all callers share one filter string; the matcher and
+		// previous-pick lookup also require a lower-cased filter.
+		final String filter = filterInput == null ? "" : filterInput.toLowerCase(); //$NON-NLS-1$
 		if (Policy.DEBUG_QUICK_ACCESS) {
 			trace("Updating proposals with filter: \"" + filter + "\""); //$NON-NLS-1$ //$NON-NLS-2$
 		}
@@ -168,6 +171,8 @@ public void updateProposals(String filter) {
 		String computingMessage = NLS.bind(QuickAccessMessages.QuickaAcessContents_computeMatchingEntries, filter);
 		int maxNumberOfItemsInTable = computeNumberOfItems();
 		lastComputedItemCount = maxNumberOfItemsInTable;
+		// Captured to detect a show-all toggle while this compute runs.
+		final boolean requestShowAllMatches = showAllMatches;
 		AtomicReference<List<QuickAccessEntry>[]> entries = new AtomicReference<>();
 		final Job currentComputeEntriesJob = Job.create(computingMessage, theMonitor -> {
 			entries.set(
@@ -203,12 +208,20 @@ public void done(IJobChangeEvent event) {
 							", entries: " + toIds(entries)); //$NON-NLS-1$
 				}
 				computingFeedbackJob.cancel();
-				if (computeProposalsJob == currentComputeEntriesJob && event.getResult().isOK()
-						&& !table.isDisposed()) {
-					if (Policy.DEBUG_QUICK_ACCESS) {
-						trace("Setting quick access contents: " + toIds(entries)); //$NON-NLS-1$
-					}
+				if (event.getResult().isOK() && !table.isDisposed()) {
 					display.asyncExec(() -> {
+						if (table.isDisposed() || filterText == null || filterText.isDisposed()) {
+							return;
+						}
+						// Apply if the results still match the current filter and show-all,
+						// not only when this is the last scheduled job.
+						if (!filter.equals(filterText.getText().toLowerCase())
+								|| requestShowAllMatches != showAllMatches) {
+							return;
+						}
+						if (Policy.DEBUG_QUICK_ACCESS) {
+							trace("Setting quick access contents: " + toIds(entries)); //$NON-NLS-1$
+						}
 						computingFeedbackJob.cancel();
 						refreshTable(perfectMatch, entries.get(), filter);
 					});