Drop Down menu in Quick Search implemented

Author: jannisCode

bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/DialogSettings.java

@@ -30,7 +30,9 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Deque;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -88,6 +90,10 @@ public class DialogSettings implements IDialogSettings {
 	// A Map with all the keys mapped to array of strings.
 	private Map<String, String[]> arrayItems;
 
+	private Deque<String> filterHistory;
+
+	private static final int FILTER_HISTORY_SIZE = 5;
+
 	private static final String TAG_SECTION = "section";//$NON-NLS-1$
 
 	private static final String TAG_NAME = "name";//$NON-NLS-1$
@@ -113,6 +119,7 @@ public DialogSettings(String sectionName) {
 		items = new LinkedHashMap<>();
 		arrayItems = new LinkedHashMap<>();
 		sections = new LinkedHashMap<>();
+		filterHistory = new LinkedList<>();
 	}
 
 	@Override
@@ -364,6 +371,22 @@ public void put(String key, String value) {
 		}
 	}
 
+	public void inputNewSearchFilter(String searchIn) {
+		filterHistory.remove(searchIn);
+		filterHistory.addFirst(searchIn);
+
+		if (filterHistory.size() > FILTER_HISTORY_SIZE) {
+			filterHistory.removeLast();
+		}
+	}
+
+	public Deque<String> getLastFilters() {
+		if (filterHistory.isEmpty()) {
+			return null;
+		}
+		return filterHistory;
+	}
+
 	@Override
 	public void put(String key, boolean value) {
 		put(key, String.valueOf(value));

bundles/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java

@@ -22,9 +22,11 @@
 
 import static org.eclipse.jface.resource.JFaceResources.TEXT_FONT;
 
+import java.awt.event.ItemEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Deque;
 import java.util.List;
 
 import org.eclipse.core.commands.AbstractHandler;
@@ -41,6 +43,7 @@
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.LegacyActionTools;
 import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.dialogs.DialogSettings;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.layout.GridDataFactory;
@@ -83,6 +86,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
@@ -369,7 +373,7 @@ public void update(ViewerCell cell) {
 	private Label headerLabel;
 
 	private IWorkbenchWindow window;
-	private Text searchIn;
+	private Combo searchIn;
 	private Label listLabel;
 
 	/**
@@ -409,16 +413,23 @@ public void create() {
 	 */
 	protected void restoreDialog(IDialogSettings settings) {
 		try {
-			if (initialPatternText==null) {
-				String lastSearch = settings.get(DIALOG_LAST_QUERY);
+			DialogSettings dialogSettings = (DialogSettings) settings;
+
+			if (initialPatternText==null && dialogSettings.getLastFilters() != null) {
+				String lastSearch = dialogSettings.get(DIALOG_LAST_QUERY);
+
 				if (lastSearch==null) {
 					lastSearch = EMPTY_STRING;
 				}
 				pattern.setText(lastSearch);
 				pattern.selectAll();
 			}
-			if (settings.get(DIALOG_PATH_FILTER)!=null) {
-				String filter = settings.get(DIALOG_PATH_FILTER);
+			if (dialogSettings.getLastFilters() != null) {
+				Deque<String> lastSearches = dialogSettings.getLastFilters();
+
+				String filter = lastSearches.getFirst();
+
+				searchIn.setItems(filterOutBlanks(lastSearches).toArray(String[]::new));
 				searchIn.setText(filter);
 			}
 
@@ -452,6 +463,12 @@ protected void restoreDialog(IDialogSettings settings) {
 		}
 	}
 
+	private Deque<String> filterOutBlanks(Deque<String> lastFiveSearches) {
+        lastFiveSearches.removeIf(str -> str.isBlank());
+        return lastFiveSearches;
+
+	}
+
 	private class ToggleKeepOpenAction extends Action {
 		public ToggleKeepOpenAction(IDialogSettings settings) {
 			super(
@@ -531,9 +548,10 @@ public boolean close() {
 	 *           settings used to store dialog
 	 */
 	protected void storeDialog(IDialogSettings settings) {
-		String currentSearch = pattern.getText();
-		settings.put(DIALOG_LAST_QUERY, currentSearch);
-		settings.put(DIALOG_PATH_FILTER, searchIn.getText());
+		((DialogSettings)settings).inputNewSearchFilter(searchIn.getText());
+
+		settings.put(DIALOG_LAST_QUERY, pattern.getText());
+
 		if (toggleCaseSensitiveAction!=null) {
 			settings.put(CASE_SENSITIVE, toggleCaseSensitiveAction.isChecked());
 		}
@@ -755,7 +773,7 @@ public void getName(AccessibleEvent e) {
 		Label searchInLabel = new Label(searchInComposite, SWT.NONE);
 		searchInLabel.setText(Messages.QuickSearchDialog_In);
 		GridDataFactory.swtDefaults().indent(5, 0).applyTo(searchInLabel);
-		searchIn = new Text(searchInComposite, SWT.SINGLE | SWT.BORDER | SWT.ICON_CANCEL);
+		searchIn = new Combo(searchInComposite, SWT.SINGLE | SWT.BORDER | SWT.ICON_CANCEL);
 		searchIn.setToolTipText(Messages.QuickSearchDialog_InTooltip);
 		GridDataFactory.fillDefaults().grab(true, false).indent(5, 0).applyTo(searchIn);