Fix highlighting for multiline class

Signed-off-by: Hope Hadfield <hhadfiel@redhat.com>

Author: hopehadfield

language-support/java/java.tmLanguage.json

@@ -305,7 +305,7 @@
 			]
 		},
 		"class": {
-			"begin": "(?=\\w?[\\w\\s-]*\\b(?:class|(?<!@)interface|enum)\\s+[\\w$]+)",
+			"begin": "(?=\\w?[\\w\\s-]*\\b(?:class|(?<!@)interface|enum))",
 			"end": "}",
 			"endCaptures": {
 				"0": {
@@ -335,6 +335,26 @@
 					"match": "(class|(?<!@)interface|enum)\\s+([\\w$]+)",
 					"name": "meta.class.identifier.java"
 				},
+				{
+					"begin": "(class|(?<!@)interface|enum)\\s+",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.java"
+						}
+					},
+					"end": "([\\w$]+\\s+)",
+					"endCaptures": {
+						"1": {
+							"name": "entity.name.type.class.java"
+						}
+					},
+					"name": "meta.class.identifier.java",
+					"patterns": [
+						{
+							"include": "#comments"
+						}
+					]
+				},
 				{
 					"begin": "extends",
 					"beginCaptures": {