Fix bobbylight#201: Rename SYNTAX_STYLE_JSHINTRC to SYNTAX_STYLE_JSON_WITH_COMMENTS so it's named for more general purpose scenarios

Author: bobbylight

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

@@ -50,7 +50,7 @@ protected void initTokenMakerMap() {
 		putMapping(SYNTAX_STYLE_HTML,			pkg + "HTMLTokenMaker");
 		putMapping(SYNTAX_STYLE_JAVA,			pkg + "JavaTokenMaker");
 		putMapping(SYNTAX_STYLE_JAVASCRIPT,		pkg + "JavaScriptTokenMaker");
-		putMapping(SYNTAX_STYLE_JSHINTRC,		pkg + "JshintrcTokenMaker");
+		putMapping(SYNTAX_STYLE_JSON_WITH_COMMENTS,	pkg + "JshintrcTokenMaker");
 		putMapping(SYNTAX_STYLE_JSON,			pkg + "JsonTokenMaker");
 		putMapping(SYNTAX_STYLE_JSP,			pkg + "JSPTokenMaker");
 		putMapping(SYNTAX_STYLE_LATEX,			pkg + "LatexTokenMaker");

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

@@ -155,15 +155,16 @@ public interface SyntaxConstants {
 
 
 	/**
-	 * Style for highlighting .jshintrc files.
+	 * Style for highlighting JSON.
 	 */
-	String SYNTAX_STYLE_JSHINTRC	= "text/jshintrc";
+	String SYNTAX_STYLE_JSON		= "text/json";
 
 
 	/**
-	 * Style for highlighting JSON.
+	 * Style for highlighting .jshintrc files (JSON with comments, so can be
+	 * used for other times when you want this behavior).
 	 */
-	String SYNTAX_STYLE_JSON		= "text/json";
+	String SYNTAX_STYLE_JSON_WITH_COMMENTS	= "text/jshintrc";
 
 
 	/**

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

@@ -81,8 +81,8 @@ private Map<String, FoldParser> createFoldParserMap() {
 		map.put(SYNTAX_STYLE_HTML,				new HtmlFoldParser(HtmlFoldParser.LANGUAGE_HTML));
 		map.put(SYNTAX_STYLE_JAVA,				new CurlyFoldParser(true, true));
 		map.put(SYNTAX_STYLE_JAVASCRIPT,		new CurlyFoldParser());
-		map.put(SYNTAX_STYLE_JSHINTRC,			new JsonFoldParser());
 		map.put(SYNTAX_STYLE_JSON,				new JsonFoldParser());
+		map.put(SYNTAX_STYLE_JSON_WITH_COMMENTS,new JsonFoldParser());
 		map.put(SYNTAX_STYLE_JSP,				new HtmlFoldParser(HtmlFoldParser.LANGUAGE_JSP));
 		map.put(SYNTAX_STYLE_LATEX,				new LatexFoldParser());
 		map.put(SYNTAX_STYLE_LESS,				new CurlyFoldParser());

src/test/java/org/fife/ui/rsyntaxtextarea/modes/JshintrcTokenMakerTest.java

@@ -116,7 +116,7 @@ public void testIntegerLiterals() {
 
 
 	@Test
-	public void testMultiLineComments() {
+	public void testLineComments() {
 		String code = "// Hello world";
 		Segment segment = createSegment(code);
 		JshintrcTokenMaker tm = new JshintrcTokenMaker();