Fix bobbylight#191: Folds are not expanded when clicking on a marker in the ErrorStrip

Author: bobbylight

src/main/java/org/fife/ui/rsyntaxtextarea/ErrorStrip.java

@@ -867,13 +867,14 @@ protected void mouseClicked(MouseEvent e) {
 			int offs = pn.getOffset();
 			int len = pn.getLength();
 			if (offs>-1 && len>-1) { // These values are optional
-				textArea.setSelectionStart(offs);
-				textArea.setSelectionEnd(offs+len);
+				DocumentRange range = new DocumentRange(offs, offs + len);
+				RSyntaxUtilities.selectAndPossiblyCenter(textArea, range, true);
 			}
 			else {
 				int line = pn.getLine();
 				try {
 					offs = textArea.getLineStartOffset(line);
+					textArea.getFoldManager().ensureOffsetNotInClosedFold(offs);
 					textArea.setCaretPosition(offs);
 				} catch (BadLocationException ble) { // Never happens
 					UIManager.getLookAndFeel().provideErrorFeedback(textArea);

src/main/java/org/fife/ui/rtextarea/RTextArea.java

@@ -97,6 +97,12 @@ public class RTextArea extends RTextAreaBase implements Printable {
 	 */
 	public static final String MARK_ALL_COLOR_PROPERTY	= "RTA.markAllColor";
 
+	/**
+	 * The property fired when the "mark all on occurrence" property changes.
+	 */
+	public static final String MARK_ALL_ON_OCCURRENCE_SEARCHES_PROPERTY =
+			"RTA.markAllOnOccurrenceSearches";
+
 	/**
 	 * The property fired when what ranges are labeled "mark all" changes.
 	 */
@@ -172,6 +178,8 @@ public class RTextArea extends RTextAreaBase implements Printable {
 
 	private SmartHighlightPainter markAllHighlightPainter;
 
+	private boolean markAllOnOccurrenceSearches;
+
 	private CaretStyle[] carets;	// Index 0=>insert caret, 1=>overwrite.
 
 	private static final String MSG	= "org.fife.ui.rtextarea.RTextArea";
@@ -723,6 +731,19 @@ public static IconGroup getIconGroup() {
 	}
 
 
+	/**
+	 * Returns whether "mark all" should be enabled when a user does a "find
+	 * next/find previous" action via Ctrl+K or Ctrl+Shift+K (the default
+	 * shortcut keys for this action).  The default value is {@code true}.
+	 *
+	 * @return Whether "mark all" should be enabled.
+	 * @see #setMarkAllOnOccurrenceSearches(boolean)
+	 */
+	public boolean getMarkAllOnOccurrenceSearches() {
+		return markAllOnOccurrenceSearches;
+	}
+
+
 	/**
 	 * Returns the line highlight manager.
 	 *
@@ -850,9 +871,6 @@ protected void handleReplaceSelection(String content) {
 	}
 
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected void init() {
 
@@ -883,6 +901,7 @@ protected void init() {
 		setDragEnabled(true);			// Enable drag-and-drop.
 
 		setTextMode(INSERT_MODE); // Carets array must be created first!
+		setMarkAllOnOccurrenceSearches(true);
 
 		// Fix the odd "Ctrl+H <=> Backspace" Java behavior.
 		fixCtrlH();
@@ -956,9 +975,6 @@ void markAll(List<DocumentRange> ranges) {
 	}
 
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public void paste() {
 		// Treat paste operations as atomic, otherwise the removal and
@@ -1492,6 +1508,25 @@ public void setMarkAllHighlightColor(Color color) {
 	}
 
 
+	/**
+	 * Sets whether "mark all" should be enabled when a user does a "find
+	 * next/find previous" action via Ctrl+K or Ctrl+Shift+K (the default
+	 * shortcut keys for this action).  The default value is {@code true}.<p>
+	 * This method fires a property change event of type
+	 * {@link #MARK_ALL_ON_OCCURRENCE_SEARCHES_PROPERTY}.
+	 *
+	 * @param markAll Whether "mark all" should be enabled.
+	 * @see #getMarkAllOnOccurrenceSearches()
+	 */
+	public void setMarkAllOnOccurrenceSearches(boolean markAll) {
+		if (markAll != markAllOnOccurrenceSearches) {
+			markAllOnOccurrenceSearches = markAll;
+			firePropertyChange(MARK_ALL_ON_OCCURRENCE_SEARCHES_PROPERTY,
+					!markAll, markAll);
+		}
+	}
+
+
 	/**
 	 * Sets the popup menu used by this text area.<p>
 	 *
@@ -1510,9 +1545,6 @@ public void setPopupMenu(JPopupMenu popupMenu) {
 	}
 
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public void setRoundedSelectionEdges(boolean rounded) {
 		if (getRoundedSelectionEdges()!=rounded) {

src/main/java/org/fife/ui/rtextarea/RTextAreaEditorKit.java

@@ -1874,6 +1874,9 @@ public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
 				}
 			}
 			SearchContext context = new SearchContext(selectedText);
+			if (!textArea.getMarkAllOnOccurrenceSearches()) {
+				context.setMarkAll(false);
+			}
 			if (!SearchEngine.find(textArea, context).wasFound()) {
 				UIManager.getLookAndFeel().provideErrorFeedback(textArea);
 			}
@@ -2190,6 +2193,9 @@ public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
 				}
 			}
 			SearchContext context = new SearchContext(selectedText);
+			if (!textArea.getMarkAllOnOccurrenceSearches()) {
+				context.setMarkAll(false);
+			}
 			context.setSearchForward(false);
 			if (!SearchEngine.find(textArea, context).wasFound()) {
 				UIManager.getLookAndFeel().provideErrorFeedback(textArea);

src/main/resources/org/fife/ui/rsyntaxtextarea/RSyntaxTextArea_fr.properties

@@ -9,6 +9,6 @@ Action.CollapseAllFolds.Desc=Comprime tous les plis.
 Action.CollapseCommentFolds.Name=Comprimer tous les commentaires
 Action.CollapseCommentFolds.Mnemonic=C
 Action.CollapseCommentFolds.Desc=Comprime tous les plis commentaires.
-Action.ExpandAllFolds.Name=D\u00e9comrpimer tous les plis
+Action.ExpandAllFolds.Name=D\u00e9comprimer tous les plis
 Action.ExpandAllFolds.Mnemonic=E
 Action.ExpandAllFolds.Desc=D\u00e9comrpime tous les plis.

src/test/java/org/fife/ui/rtextarea/RTextAreaTest.java

@@ -0,0 +1,95 @@
+package org.fife.ui.rtextarea;
+
+import org.fife.ui.SwingRunner;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+/**
+ * Unit tests for the {@link RTextArea} class.
+ *
+ * @author Robert Futrell
+ * @version 1.0
+ */
+@RunWith(SwingRunner.class)
+public class RTextAreaTest {
+
+
+	@Test
+	public void testCanRedo() {
+		RTextArea textArea = new RTextArea();
+		Assert.assertFalse(textArea.canRedo());
+		textArea.replaceSelection("Hi");
+		Assert.assertFalse(textArea.canRedo());
+		textArea.undoLastAction();
+		Assert.assertTrue(textArea.canRedo());
+		textArea.redoLastAction();
+		Assert.assertFalse(textArea.canRedo());
+	}
+
+
+	@Test
+	public void testCanUndo() {
+		RTextArea textArea = new RTextArea();
+		Assert.assertFalse(textArea.canUndo());
+		textArea.replaceSelection("Hi");
+		Assert.assertTrue(textArea.canUndo());
+		textArea.undoLastAction();
+		Assert.assertFalse(textArea.canUndo());
+	}
+
+
+	@Test
+	public void testCreateDefaultModel() {
+		RTextArea textArea = new RTextArea();
+		Assert.assertTrue(textArea.createDefaultModel() instanceof RDocument);
+	}
+
+
+	@Test
+	public void testDiscardAllEdits() {
+		RTextArea textArea = new RTextArea();
+		textArea.replaceSelection("Hi");
+		Assert.assertTrue(textArea.canUndo());
+		textArea.discardAllEdits();
+		Assert.assertFalse(textArea.canUndo());
+	}
+
+
+	@Test
+	public void testGetPopupMenu() {
+		RTextArea textArea = new RTextArea();
+		Assert.assertNotNull(textArea.getPopupMenu());
+	}
+
+
+	@Test
+	public void testRecordingMacro_happyPath() {
+		Assert.assertFalse(RTextArea.isRecordingMacro());
+		RTextArea.beginRecordingMacro();
+		Assert.assertTrue(RTextArea.isRecordingMacro());
+		RTextArea.endRecordingMacro();
+		Assert.assertFalse(RTextArea.isRecordingMacro());
+	}
+
+
+	@Test
+	public void testRecordingMacro_endWhileNotRecording() {
+		Assert.assertFalse(RTextArea.isRecordingMacro());
+		Assert.assertFalse(RTextArea.isRecordingMacro());
+		RTextArea.endRecordingMacro();
+		Assert.assertFalse(RTextArea.isRecordingMacro());
+	}
+
+
+	@Test
+	public void testMarkAllOnOccurrenceSearches() {
+		RTextArea textArea = new RTextArea();
+		Assert.assertTrue(textArea.getMarkAllOnOccurrenceSearches());
+		textArea.setMarkAllOnOccurrenceSearches(false);
+		Assert.assertFalse(textArea.getMarkAllOnOccurrenceSearches());
+	}
+
+
+}