Fix bobbylight#195: Repaint gutter if necessary when ensuring an offset is not in a closed fold

Author: bobbylight

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

@@ -31,7 +31,6 @@
 import org.fife.ui.rsyntaxtextarea.folding.FoldCollapser;
 import org.fife.ui.rsyntaxtextarea.folding.FoldManager;
 import org.fife.ui.rsyntaxtextarea.templates.CodeTemplate;
-import org.fife.ui.rtextarea.Gutter;
 import org.fife.ui.rtextarea.IconRowHeader;
 import org.fife.ui.rtextarea.RTextArea;
 import org.fife.ui.rtextarea.RTextAreaEditorKit;
@@ -286,7 +285,7 @@ public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
 				if (fold!=null) {
 					fold.setCollapsed(collapse);
 				}
-				possiblyRepaintGutter(textArea);
+				RSyntaxUtilities.possiblyRepaintGutter(textArea);
 			}
 			else {
 				UIManager.getLookAndFeel().provideErrorFeedback(rsta);
@@ -560,7 +559,7 @@ public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
 			if (rsta.isCodeFoldingEnabled()) {
 				FoldCollapser collapser = new FoldCollapser();
 				collapser.collapseFolds(rsta.getFoldManager());
-				possiblyRepaintGutter(textArea);
+				RSyntaxUtilities.possiblyRepaintGutter(textArea);
 			}
 			else {
 				UIManager.getLookAndFeel().provideErrorFeedback(rsta);
@@ -609,7 +608,7 @@ public boolean getShouldCollapse(Fold fold) {
 					}
 				};
 				collapser.collapseFolds(rsta.getFoldManager());
-				possiblyRepaintGutter(textArea);
+				RSyntaxUtilities.possiblyRepaintGutter(textArea);
 			}
 			else {
 				UIManager.getLookAndFeel().provideErrorFeedback(rsta);
@@ -1197,7 +1196,7 @@ public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
 				for (int i=0; i<fm.getFoldCount(); i++) {
 					expand(fm.getFold(i));
 				}
-				possiblyRepaintGutter(rsta);
+				RSyntaxUtilities.possiblyRepaintGutter(rsta);
 			}
 			else {
 				UIManager.getLookAndFeel().provideErrorFeedback(rsta);
@@ -1244,18 +1243,6 @@ protected Fold getClosestFold(RSyntaxTextArea textArea) {
 			return fold;
 		}
 
-		/**
-		 * Repaints the gutter in a text area's scroll pane, if necessary.
-		 *
-		 * @param textArea The text area.
-		 */
-		protected void possiblyRepaintGutter(RTextArea textArea) {
-			Gutter gutter = RSyntaxUtilities.getGutter(textArea);
-			if (gutter!=null) {
-				gutter.repaint();
-			}
-		}
-
 	}
 
 
@@ -2104,7 +2091,7 @@ public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
 				if (fold!=null) {
 					fold.toggleCollapsedState();
 				}
-				possiblyRepaintGutter(textArea);
+				RSyntaxUtilities.possiblyRepaintGutter(textArea);
 			}
 			else {
 				UIManager.getLookAndFeel().provideErrorFeedback(rsta);

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

@@ -1336,6 +1336,19 @@ public static boolean isWhitespace(char ch) {
 	}
 
 
+	/**
+	 * Repaints the gutter in a text area's scroll pane, if necessary.
+	 *
+	 * @param textArea The text area.
+	 */
+	public static void possiblyRepaintGutter(RTextArea textArea) {
+		Gutter gutter = RSyntaxUtilities.getGutter(textArea);
+		if (gutter!=null) {
+			gutter.repaint();
+		}
+	}
+
+
 	/**
 	 * Returns whether a regular expression token can follow the specified
 	 * token in JavaScript.

src/main/java/org/fife/ui/rsyntaxtextarea/folding/DefaultFoldManager.java

@@ -12,6 +12,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.text.BadLocationException;
@@ -20,6 +21,7 @@
 
 import org.fife.ui.rsyntaxtextarea.RSyntaxDocument;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+import org.fife.ui.rsyntaxtextarea.RSyntaxUtilities;
 import org.fife.ui.rsyntaxtextarea.parser.AbstractParser;
 import org.fife.ui.rsyntaxtextarea.parser.DefaultParseResult;
 import org.fife.ui.rsyntaxtextarea.parser.ParseResult;
@@ -87,16 +89,24 @@ public void clear() {
 
 	@Override
 	public boolean ensureOffsetNotInClosedFold(int offs) {
+
 		boolean foldsOpened = false;
 		Fold fold = getDeepestFoldContaining(offs);
+
 		while (fold!=null) {
 			if (fold.isCollapsed()) {
 				fold.setCollapsed(false);
 				foldsOpened = true;
 			}
 			fold = fold.getParent();
 		}
+
+		if (foldsOpened) { // Folds changing state mean gutter is stale
+			RSyntaxUtilities.possiblyRepaintGutter(textArea);
+		}
+
 		return foldsOpened;
+
 	}
 
 

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

@@ -76,7 +76,7 @@ public static SearchResult find(JTextArea textArea, SearchContext context) {
 			if (doMarkAll) {
 				// Force "mark all" event to be broadcast so listeners know to
 				// clear their mark-all markers.  The RSTA already cleared its
-				// highlights above, but cleraMarkAllHighlights() doesn't firs
+				// highlights above, but cleraMarkAllHighlights() doesn't fire
 				// an event itself for performance reasons.
 				List<DocumentRange> emptyRangeList = Collections.emptyList();
 				((RTextArea)textArea).markAll(emptyRangeList);