Java: Add support for generics. Fix #1351

components/prism-java.js

@@ -14,3 +14,14 @@ Prism.languages.insertBefore('java','function', {
 		lookbehind: true
 	}
 });
+
+Prism.languages.insertBefore('java', 'class-name', {
+	'generics': {
+		pattern: /<\s*\w+(?:\.\w+)?(?:\s*,\s*\w+(?:\.\w+)?)*>/i,
+		alias: 'function',
+		inside: {
+			keyword: Prism.languages.java.keyword,
+			punctuation: /[<>(),.:]/
+		}
+	}
+});

tests/languages/java/generics_feature.test

@@ -0,0 +1,65 @@
+public class Solo<T> {}
+Solo<Integer> val = new Solo<Integer>();
+Duo<Double, Character> dual = new Duo<Double, Character>(12.2585, 'C');
+
+----------------------------------------------------
+
+[
+	["keyword", "public"],
+	["keyword", "class"],
+	["class-name", ["Solo"]],
+	["generics", [
+		["punctuation", "<"],
+		"T",
+		["punctuation", ">"]
+	]],
+	["punctuation", "{"],
+	["punctuation", "}"],
+	"\r\nSolo",
+	["generics", [
+		["punctuation", "<"],
+		"Integer",
+		["punctuation", ">"]
+	]],
+	" val ",
+	["operator", "="],
+	["keyword", "new"],
+	["class-name", ["Solo"]],
+	["generics", [
+		["punctuation", "<"],
+		"Integer",
+		["punctuation", ">"]
+	]],
+	["punctuation", "("],
+	["punctuation", ")"],
+	["punctuation", ";"],
+	"\r\nDuo",
+	["generics", [
+		["punctuation", "<"],
+		"Double",
+		["punctuation", ","],
+		" Character",
+		["punctuation", ">"]
+	]],
+	" dual ",
+	["operator", "="],
+	["keyword", "new"],
+	["class-name", ["Duo"]],
+	["generics", [
+		["punctuation", "<"],
+		"Double",
+		["punctuation", ","],
+		" Character",
+		["punctuation", ">"]
+	]],
+	["punctuation", "("],
+	["number", "12.2585"],
+	["punctuation", ","],
+	["string", "'C'"],
+	["punctuation", ")"],
+	["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+Checks for generics.

tests/languages/java/issue1351.test

@@ -0,0 +1,27 @@
+public class AllChangesIndexer extends SiteIndexer<Change.Id, ChangeData, ChangeIndex> {
+
+----------------------------------------------------
+
+[
+	["keyword", "public"],
+	["keyword", "class"],
+	["class-name", ["AllChangesIndexer"]],
+	["keyword", "extends"],
+	["class-name", ["SiteIndexer"]],
+	["generics", [
+		["punctuation", "<"],
+		"Change",
+		["punctuation", "."],
+		"Id",
+		["punctuation", ","],
+		" ChangeData",
+		["punctuation", ","],
+		" ChangeIndex",
+		["punctuation", ">"]
+	]],
+	["punctuation", "{"]
+]
+
+----------------------------------------------------
+
+Checks for generics.