Fix #14: Added a search wrap function. Thanks to @giles7777; this is his pull request but with merge conflicts resolved. Somehow I messed up the merge so it's no longer part of his pull request, sorry!

Author: bobbylight

RSTAUI/build.gradle

@@ -9,7 +9,7 @@ assert JavaVersion.current().isJava8Compatible()
 archivesBaseName = 'rstaui'
 
 dependencies {
-    api 'com.fifesoft:rsyntaxtextarea:3.0.8'
+    api 'com.fifesoft:rsyntaxtextarea:3.0.9-SNAPSHOT'
     api 'com.fifesoft:autocomplete:3.0.5'
     testImplementation 'junit:junit:4.12'
 }

RSTAUI/src/main/java/org/fife/rsta/ui/search/AbstractFindReplaceDialog.java

@@ -339,6 +339,7 @@ private void init() {
 		temp.setLayout(new BoxLayout(temp, BoxLayout.PAGE_AXIS));
 		temp.add(caseCheckBox);
 		temp.add(wholeWordCheckBox);
+		temp.add(wrapCheckBox);
 		searchConditionsPanel.add(temp, BorderLayout.LINE_START);
 		temp = new JPanel();
 		temp.setLayout(new BoxLayout(temp, BoxLayout.PAGE_AXIS));

RSTAUI/src/main/java/org/fife/rsta/ui/search/AbstractSearchDialog.java

@@ -58,6 +58,7 @@ public class AbstractSearchDialog extends EscapableDialog
 	protected JCheckBox caseCheckBox;
 	protected JCheckBox wholeWordCheckBox;
 	protected JCheckBox regexCheckBox;
+	protected JCheckBox wrapCheckBox;
 	protected JPanel searchConditionsPanel;
 
 	/**
@@ -130,13 +131,18 @@ public void actionPerformed(ActionEvent e) {
 				context.setRegularExpression(useRegEx);
 				break;
 
+			// They check/uncheck the "Wrap" checkbox on the Find dialog.
+			case "FlipWrap":
+				boolean wrap = wrapCheckBox.isSelected();
+				context.setSearchWrap(wrap);
+				break;
+
 			// If they press the "Cancel" button.
 			case "Cancel":
             default: // SpotBugs
 				setVisible(false);
 				break;
 		}
-
 	}
 
 
@@ -297,6 +303,16 @@ public final String getWholeWordCheckboxText() {
 		return wholeWordCheckBox.getText();
 	}
 
+	/**
+	 * Returns the text for the "Wrap" check box.
+	 *
+	 * @return The text for the "Wrap" check box.
+	 * @see #setWrapCheckboxText
+	 */
+	public final String getWrapCheckboxText() {
+		return wrapCheckBox.getText();
+	}
+
 
 	/**
 	 * Called when the regex checkbox is clicked (or its value is modified
@@ -351,6 +367,10 @@ else if (SearchContext.PROPERTY_SEARCH_FOR.equals(prop)) {
 				setSearchString(newValue);
 			}
 		}
+		else if (SearchContext.PROPERTY_SEARCH_WRAP.equals(prop)) {
+			boolean newValue = ((Boolean)e.getNewValue()).booleanValue();
+			wrapCheckBox.setSelected(newValue);
+		}
 
 	}
 
@@ -400,6 +420,9 @@ private void init() {
 		regexCheckBox = createCheckBox(MSG, "RegEx");
 		searchConditionsPanel.add(regexCheckBox);
 
+		wrapCheckBox = createCheckBox(MSG, "Wrap");
+		searchConditionsPanel.add(wrapCheckBox);
+
 		// Initialize any text fields.
 		findTextCombo = new SearchComboBox(null, false);
 
@@ -508,6 +531,7 @@ protected void refreshUIFromContext() {
 		this.caseCheckBox.setSelected(context.getMatchCase());
 		this.regexCheckBox.setSelected(context.isRegularExpression());
 		this.wholeWordCheckBox.setSelected(context.getWholeWord());
+		this.wrapCheckBox.setSelected(context.getSearchWrap());
 	}
 
 
@@ -607,6 +631,15 @@ public final void setWholeWordCheckboxText(String text) {
 		wholeWordCheckBox.setText(text);
 	}
 
+	/**
+	 * Sets the text for the "Wrap" check box.
+	 *
+	 * @param text The text for the "Whole Word" check box.
+	 * @see #getWholeWordCheckboxText
+	 */
+	public final void setWrapCheckboxText(String text) {
+		wrapCheckBox.setText(text);
+	}
 
 	/**
 	 * Listens for properties changing in the search context.

RSTAUI/src/main/java/org/fife/rsta/ui/search/FindToolBar.java

@@ -69,6 +69,8 @@ public class FindToolBar extends JPanel {
 	protected JCheckBox wholeWordCheckBox;
 	protected JCheckBox regexCheckBox;
 	protected JCheckBox markAllCheckBox;
+	protected JCheckBox wrapCheckBox;
+	private JLabel infoLabel;
 	private Timer markAllTimer;
 
 	/**
@@ -126,7 +128,6 @@ public FindToolBar(SearchListener listener) {
 
 		// Get ready to go.
 		applyComponentOrientation(orientation);
-
 	}
 
 
@@ -153,7 +154,7 @@ protected Container createButtonPanel() {
 		filler.setBorder(BorderFactory.createEmptyBorder());
 		filler.add(findButton);//bp);
 		panel.add(filler);
-		panel.add(Box.createHorizontalStrut(5));
+		panel.add(Box.createHorizontalStrut(6));
 
 		matchCaseCheckBox = createCB("MatchCase");
 		panel.add(matchCaseCheckBox);
@@ -167,6 +168,9 @@ protected Container createButtonPanel() {
 		markAllCheckBox = createCB("MarkAll");
 		panel.add(markAllCheckBox);
 
+		wrapCheckBox = createCB("Wrap");
+		panel.add(wrapCheckBox);
+
 		return panel;
 
 	}
@@ -475,6 +479,7 @@ protected void initUIFromContext() {
 		wholeWordCheckBox.setSelected(context.getWholeWord());
 		regexCheckBox.setSelected(context.isRegularExpression());
 		markAllCheckBox.setSelected(context.getMarkAll());
+		wrapCheckBox.setSelected(context.getSearchWrap());
 	}
 
 
@@ -669,6 +674,9 @@ else if (source==markAllCheckBox) {
 				context.setMarkAll(markAllCheckBox.isSelected());
 				fireMarkAllEvent(); // Force an event to be fired
 			}
+			else if (source == wrapCheckBox) {
+				context.setSearchWrap(wrapCheckBox.isSelected());
+			}
 			else {
 				handleSearchAction(e);
 			}
@@ -736,6 +744,10 @@ else if (SearchContext.PROPERTY_REPLACE_WITH.equals(prop)) {
 					settingFindTextFromEvent = false;
 				}
 			}
+			else if (SearchContext.PROPERTY_SEARCH_WRAP.equals(prop)) {
+				boolean newValue = ((Boolean)e.getNewValue()).booleanValue();
+				wrapCheckBox.setSelected(newValue);
+			}
 
 		}
 

RSTAUI/src/main/java/org/fife/rsta/ui/search/ReplaceToolBar.java

@@ -85,27 +85,30 @@ protected Container createButtonPanel() {
 		regexCheckBox = createCB("RegEx");
 		wholeWordCheckBox = createCB("WholeWord");
 		markAllCheckBox = createCB("MarkAll");
+		wrapCheckBox = createCB("Wrap");
 		// We use a "spacing" middle row, instead of spacing in the call to
 		// UIUtil.makeSpringCompactGrid(), as the latter adds trailing
 		// spacing after the final "row", which screws up our alignment.
 		Dimension spacing = new Dimension(1, 5);
 		Component space1 = Box.createRigidArea(spacing);
 		Component space2 = Box.createRigidArea(spacing);
+		Component space3 = Box.createRigidArea(spacing);
+		Component space4 = Box.createRigidArea(spacing);
 
 		ComponentOrientation orientation = ComponentOrientation.
 				getOrientation(getLocale());
 
 		if (orientation.isLeftToRight()) {
-			optionPanel.add(matchCaseCheckBox); optionPanel.add(wholeWordCheckBox);
-			optionPanel.add(space1);            optionPanel.add(space2);
-			optionPanel.add(regexCheckBox);     optionPanel.add(markAllCheckBox);
+			optionPanel.add(matchCaseCheckBox); optionPanel.add(wholeWordCheckBox); optionPanel.add(wrapCheckBox);
+			optionPanel.add(space1);            optionPanel.add(space2);            optionPanel.add(space3);
+			optionPanel.add(regexCheckBox);     optionPanel.add(markAllCheckBox);   optionPanel.add(space4);
 		}
 		else {
-			optionPanel.add(wholeWordCheckBox); optionPanel.add(matchCaseCheckBox);
-			optionPanel.add(space2);            optionPanel.add(space1);
-			optionPanel.add(markAllCheckBox);   optionPanel.add(regexCheckBox);
+			optionPanel.add(wrapCheckBox); optionPanel.add(wholeWordCheckBox); optionPanel.add(matchCaseCheckBox);
+			optionPanel.add(space3);       optionPanel.add(space2);            optionPanel.add(space1);
+			optionPanel.add(space4);       optionPanel.add(markAllCheckBox);   optionPanel.add(regexCheckBox);
 		}
-		UIUtil.makeSpringCompactGrid(optionPanel, 3,2, 0,0, 0,0);
+		UIUtil.makeSpringCompactGrid(optionPanel, 3,3, 0,0, 0,0);
 		panel.add(optionPanel);
 
 		return panel;

RSTAUI/src/main/resources/org/fife/rsta/ui/search/Search.properties

@@ -13,6 +13,8 @@ RegEx=Regex
 MatchCaseMnemonic=M
 WholeWordMnemonic=W
 RegExMnemonic=E
+Wrap=Wrap
+WrapMnemonic=Z
 
 FindWhat=Find what:   
 ReplaceWith=Replace with: