Merge pull request #47 from Halliburton-Landmark/find_actions_previou…

…s_entries_fix Avoid duplicate quick access entry eclipse-platform/eclipse.platform.ui#152
Halliburton-Landmark · Jul 30, 2024 · 5262a97 · 5262a97
2 parents f2de834 + cf2184b
commit 5262a97
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...ipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java b/...ipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java
@@ -540,6 +540,14 @@ public IStatus runInUIThread(IProgressMonitor monitor) {
 					QuickAccessEntry.MATCH_PERFECT)));
 		}
 		res.addAll(entriesPerProvider.values());
+
+		// if one category provides the same single entry like "previous", we can avoid
+		// showing the duplicate second list
+		if (res.size() >= 2 && res.get(0).size() == 1 && res.get(1).size() == 1
+				&& (res.get(0).get(0).element.equals(res.get(1).get(0).element))) {
+			res.remove(1);
+		}
+
 		return (List<QuickAccessEntry>[]) res.toArray(new List<?>[res.size()]);
 	}
 

diff --git a/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true
-Bundle-Version: 3.131.0.lgc20240523-1900
+Bundle-Version: 3.131.0.lgc20240729-1900
 Bundle-Activator: org.eclipse.ui.internal.WorkbenchPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName