Drop Down menu in Quick Search implemented

Author: jannisCode

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

@@ -25,6 +25,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Deque;
+import java.util.LinkedList;
 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;
@@ -303,6 +307,10 @@ public void update(ViewerCell cell) {
 	private static final String KEEP_OPEN = "KEEP_OPEN"; //$NON-NLS-1$
 	private static final boolean KEEP_OPEN_DEFAULT = false;
 
+	private static Deque<String> filterHistory = new LinkedList<>();
+
+	private static final int FILTER_HISTORY_SIZE = 5;
+
 	/**
 	 * Represents an empty selection in the pattern input field (used only for
 	 * initial pattern).
@@ -369,7 +377,7 @@ public void update(ViewerCell cell) {
 	private Label headerLabel;
 
 	private IWorkbenchWindow window;
-	private Text searchIn;
+	private Combo searchIn;
 	private Label listLabel;
 
 	/**
@@ -409,16 +417,21 @@ public void create() {
 	 */
 	protected void restoreDialog(IDialogSettings settings) {
 		try {
-			if (initialPatternText==null) {
+			if (initialPatternText==null && getLastFilters() != null) {
 				String lastSearch = settings.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 (getLastFilters() != null) {
+				Deque<String> lastSearches = getLastFilters();
+
+				String filter = lastSearches.getFirst();
+
+				searchIn.setItems(filterOutBlanks(lastSearches).toArray(String[]::new));
 				searchIn.setText(filter);
 			}
 
@@ -452,6 +465,28 @@ protected void restoreDialog(IDialogSettings settings) {
 		}
 	}
 
+	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;
+	}
+
+	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 +566,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());
+		inputNewSearchFilter(searchIn.getText());
+
+		settings.put(DIALOG_LAST_QUERY, pattern.getText());
+
 		if (toggleCaseSensitiveAction!=null) {
 			settings.put(CASE_SENSITIVE, toggleCaseSensitiveAction.isChecked());
 		}
@@ -755,7 +791,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);