Merge branch 'ToggleCommentAction-fix' into ToggleCommentAction-white…

…space-fix

# Conflicts:
#	RSyntaxTextArea/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKitToggleCommentActionTest.java

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

@@ -2213,15 +2213,15 @@ public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
 				return;
 			}
 
-			RSyntaxDocument doc = (RSyntaxDocument)textArea.getDocument();
+			RSyntaxDocument doc = (RSyntaxDocument) textArea.getDocument();
 			Element map = doc.getDefaultRootElement();
 			Caret c = textArea.getCaret();
 			int dot = c.getDot();
 			int mark = c.getMark();
 			int line1 = map.getElementIndex(dot);
 			int line2 = map.getElementIndex(mark);
 			int start = Math.min(line1, line2);
-			int end   = Math.max(line1, line2);
+			int end = Math.max(line1, line2);
 
 			Token t = doc.getTokenListForLine(start);
 			int languageIndex = t != null ? t.getLanguageIndex() : 0;
@@ -2234,7 +2234,7 @@ public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
 
 			// Don't toggle comment on last line if there is no
 			// text selected on it.
-			if (start!=end) {
+			if (start != end) {
 				Element elem = map.getElement(end);
 				if (Math.max(dot, mark) == elem.getStartOffset()) {
 					end--;

RSyntaxTextArea/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKitToggleCommentActionTest.java

@@ -218,4 +218,4 @@ void startEndSearch() {
 		Assertions.assertEquals(-1, action.endMatch("   // text", markers));
 		Assertions.assertEquals(-1, action.endMatch("", markers));
 	}
-}
+}