Java: Added support for constants (#3507)

components/prism-java.js

@@ -55,7 +55,8 @@
 		'operator': {
 			pattern: /(^|[^.])(?:<<=?|>>>?=?|->|--|\+\+|&&|\|\||::|[?:~]|[-+*/%&|^!=<>]=?)/m,
 			lookbehind: true
-		}
+		},
+		'constant': /\b[A-Z][A-Z_\d]+\b/
 	});
 
 	Prism.languages.insertBefore('java', 'string', {

components/prism-scala.js

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

tests/languages/java/annotation_feature.test

@@ -16,17 +16,17 @@
 	["punctuation", "("],
 	"value",
 	["operator", "="],
-	"SOURCE",
+	["constant", "SOURCE"],
 	["punctuation", ")"],
 
 	["annotation", "@Target"],
 	["punctuation", "("],
 	"value",
 	["operator", "="],
 	["punctuation", "{"],
-	"PACKAGE",
+	["constant", "PACKAGE"],
 	["punctuation", ","],
-	"TYPE",
+	["constant", "TYPE"],
 	["punctuation", "}"],
 	["punctuation", ")"]
 ]

tests/languages/java/constant_feature.test

@@ -0,0 +1,61 @@
+public class Test {
+    private static final String AAAA = "aaaaaa";
+
+    private String str = "1";
+
+    public static void main(String[] args) {
+        str += AAAA + "AAAA";
+    }
+}
+
+----------------------------------------------------
+
+[
+	["keyword", "public"],
+	["keyword", "class"],
+	["class-name", ["Test"]],
+	["punctuation", "{"],
+
+	["keyword", "private"],
+	["keyword", "static"],
+	["keyword", "final"],
+	["class-name", ["String"]],
+	["constant", "AAAA"],
+	["operator", "="],
+	["string", "\"aaaaaa\""],
+	["punctuation", ";"],
+
+	["keyword", "private"],
+	["class-name", ["String"]],
+	" str ",
+	["operator", "="],
+	["string", "\"1\""],
+	["punctuation", ";"],
+
+	["keyword", "public"],
+	["keyword", "static"],
+	["keyword", "void"],
+	["function", "main"],
+	["punctuation", "("],
+	["class-name", ["String"]],
+	["punctuation", "["],
+	["punctuation", "]"],
+	" args",
+	["punctuation", ")"],
+	["punctuation", "{"],
+
+	"\r\n        str ",
+	["operator", "+="],
+	["constant", "AAAA"],
+	["operator", "+"],
+	["string", "\"AAAA\""],
+	["punctuation", ";"],
+
+	["punctuation", "}"],
+
+	["punctuation", "}"]
+]
+
+----------------------------------------------------
+
+Checks for all constants.