Fix bobbylight#204: Custom TokenMaker hangs with overridden isIdentifierChar()

Author: bobbylight

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

@@ -12,6 +12,7 @@
 import java.awt.Font;
 import java.awt.Point;
 import java.awt.event.ActionEvent;
+import java.text.CharacterIterator;
 import java.util.ResourceBundle;
 import java.util.Stack;
 
@@ -232,7 +233,7 @@ protected int getWordStart(RTextArea textArea, int offs)
 				}
 				do {
 					ch = seg.previous();
-				} while (doc.isIdentifierChar(languageIndex, ch));
+				} while (doc.isIdentifierChar(languageIndex, ch) && ch != CharacterIterator.DONE);
 			}
 
 			// The "word" is whitespace
@@ -1143,7 +1144,8 @@ protected int getWordEnd(RTextArea textArea, int offs)
 			if (doc.isIdentifierChar(languageIndex, ch)) {
 				do {
 					ch = seg.next();
-				} while (doc.isIdentifierChar(languageIndex, ch));
+				} while (doc.isIdentifierChar(languageIndex, ch) &&
+						ch != CharacterIterator.DONE);
 			}
 
 			// The "word" is whitespace.
@@ -1745,7 +1747,8 @@ protected int getNextWord(RTextArea textArea, int offs)
 			if (doc.isIdentifierChar(languageIndex, ch)) {
 				do {
 					ch = seg.next();
-				} while (doc.isIdentifierChar(languageIndex, ch));
+				} while (doc.isIdentifierChar(languageIndex, ch) &&
+						ch != CharacterIterator.DONE);
 			}
 
 			// Skip groups of "anything else" (operators, etc.).
@@ -1919,7 +1922,8 @@ protected int getPreviousWord(RTextArea textArea, int offs)
 			if (doc.isIdentifierChar(languageIndex, ch)) {
 				do {
 					ch = seg.previous();
-				} while (doc.isIdentifierChar(languageIndex, ch));
+				} while (doc.isIdentifierChar(languageIndex, ch) &&
+						ch != CharacterIterator.DONE);
 			}
 
 			// Skip groups of "anything else" (operators, etc.).