Java: Added support for constants

components/prism-java.js

@@ -55,7 +55,13 @@
 		'operator': {
 			pattern: /(^|[^.])(?:<<=?|>>>?=?|->|--|\+\+|&&|\|\||::|[?:~]|[-+*/%&|^!=<>]=?)/m,
 			lookbehind: true
-		}
+		},
+		'constant': /\b[A-Z][A-Z_\d]+\b/,
+		'variable': [
+			{
+				pattern: /\b(?:args|log(?:ger)?|value)\b/
+			}
+		]
 	});
 
 	Prism.languages.insertBefore('java', 'string', {
@@ -120,4 +126,19 @@
 			}
 		}
 	});
+
+	// variable from window.PrismConfig
+	if (typeof window !== 'undefined') {
+		var prismConfig = window.PrismConfig;
+		if (prismConfig && prismConfig.languages && prismConfig.languages.java && prismConfig.languages.java.variable) {
+			var variableConfig = prismConfig.languages.java.variable;
+			if (variableConfig instanceof Array) {
+				if (variableConfig.length > 0) {
+					Prism.languages.java.variable = Prism.languages.java.variable.concat(variableConfig);
+				}
+			} else if (typeof variableConfig === 'object') {
+				Prism.languages.java.variable[Prism.languages.java.variable.length] = variableConfig;
+			}
+		}
+	}
 }(Prism));

components/prism-scala.js

@@ -47,3 +47,5 @@ Prism.languages.insertBefore('scala', 'triple-quoted-string', {
 
 delete Prism.languages.scala['class-name'];
 delete Prism.languages.scala['function'];
+delete Prism.languages.scala['constant'];
+delete Prism.languages.scala['variable'];

tests/languages/java/annotation_feature.test

@@ -14,19 +14,19 @@
 
 	["annotation", "@Retention"],
 	["punctuation", "("],
-	"value",
+	["variable", "value"],
 	["operator", "="],
-	"SOURCE",
+	["constant", "SOURCE"],
 	["punctuation", ")"],
 
 	["annotation", "@Target"],
 	["punctuation", "("],
-	"value",
+	["variable", "value"],
 	["operator", "="],
 	["punctuation", "{"],
-	"PACKAGE",
+	["constant", "PACKAGE"],
 	["punctuation", ","],
-	"TYPE",
+	["constant", "TYPE"],
 	["punctuation", "}"],
 	["punctuation", ")"]
 ]

tests/languages/java/variable_feature.test

@@ -0,0 +1,110 @@
+@Test(value = Xxxx.TYPE)
+public class Test<A, BB> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Test.class);
+
+    private String str = "1";
+    private String arg = "2";
+    private String var1 = "3";
+
+    public static void main(String[] args) {
+        LOGGER.info("test LOGGER: {}, {}, {}",
+            str, arg, var1);
+    }
+}
+
+----------------------------------------------------
+
+[
+	["annotation", "@Test"],
+	["punctuation", "("],
+	["variable", "value"],
+	["operator", "="],
+	["class-name", ["Xxxx"]],
+	["punctuation", "."],
+	["constant", "TYPE"],
+	["punctuation", ")"],
+
+	["keyword", "public"],
+	["keyword", "class"],
+	["class-name", ["Test"]],
+	["generics", [
+		["punctuation", "<"],
+		["class-name", ["A"]],
+		["punctuation", ","],
+		" BB",
+		["punctuation", ">"]
+	]],
+	["punctuation", "{"],
+
+	["keyword", "private"],
+	["keyword", "static"],
+	["keyword", "final"],
+	["class-name", ["Logger"]],
+	["constant", "LOGGER"],
+	["operator", "="],
+	["class-name", ["LoggerFactory"]],
+	["punctuation", "."],
+	["function", "getLogger"],
+	["punctuation", "("],
+	["class-name", ["Test"]],
+	["punctuation", "."],
+	["keyword", "class"],
+	["punctuation", ")"],
+	["punctuation", ";"],
+
+	["keyword", "private"],
+	["class-name", ["String"]],
+	" str ",
+	["operator", "="],
+	["string", "\"1\""],
+	["punctuation", ";"],
+
+	["keyword", "private"],
+	["class-name", ["String"]],
+	" arg ",
+	["operator", "="],
+	["string", "\"2\""],
+	["punctuation", ";"],
+
+	["keyword", "private"],
+	["class-name", ["String"]],
+	" var1 ",
+	["operator", "="],
+	["string", "\"3\""],
+	["punctuation", ";"],
+
+	["keyword", "public"],
+	["keyword", "static"],
+	["keyword", "void"],
+	["function", "main"],
+	["punctuation", "("],
+	["class-name", ["String"]],
+	["punctuation", "["],
+	["punctuation", "]"],
+	["variable", "args"],
+	["punctuation", ")"],
+	["punctuation", "{"],
+
+	["constant", "LOGGER"],
+	["punctuation", "."],
+	["function", "info"],
+	["punctuation", "("],
+	["string", "\"test LOGGER: {}, {}, {}\""],
+	["punctuation", ","],
+
+	"\r\n            str",
+	["punctuation", ","],
+	" arg",
+	["punctuation", ","],
+	" var1",
+	["punctuation", ")"],
+	["punctuation", ";"],
+
+	["punctuation", "}"],
+
+	["punctuation", "}"]
+]
+
+----------------------------------------------------
+
+Checks for all keywords.