update grammars

extensions/java/syntaxes/java.tmLanguage.json

@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/atom/language-java/commit/f213dfac7dc3726170046c8f0c174c9e9f13e4ce",
+	"version": "https://github.com/atom/language-java/commit/295af4375e4a5da4a4352fa08a8bb3e17145ec47",
 	"name": "Java",
 	"scopeName": "source.java",
 	"patterns": [
@@ -361,10 +361,10 @@
 					"include": "#comments"
 				},
 				{
-					"include": "#class"
+					"include": "#enums"
 				},
 				{
-					"include": "#enums"
+					"include": "#class"
 				},
 				{
 					"include": "#generics"
@@ -525,9 +525,9 @@
 		"comments-javadoc": {
 			"patterns": [
 				{
-					"begin": "^\\s*/\\*\\*(?!/)",
+					"begin": "^\\s*(/\\*\\*)(?!/)",
 					"beginCaptures": {
-						"0": {
+						"1": {
 							"name": "punctuation.definition.comment.java"
 						}
 					},
@@ -600,12 +600,19 @@
 			]
 		},
 		"enums": {
-			"begin": "^\\s*(enum)\\s+(\\w+)",
+			"begin": "^\\s*([\\w\\s]*)(enum)\\s+(\\w+)",
 			"beginCaptures": {
 				"1": {
-					"name": "storage.modifier.java"
+					"patterns": [
+						{
+							"include": "#storage-modifiers"
+						}
+					]
 				},
 				"2": {
+					"name": "storage.modifier.java"
+				},
+				"3": {
 					"name": "entity.name.type.enum.java"
 				}
 			},
@@ -627,16 +634,47 @@
 					"end": "(?=})",
 					"patterns": [
 						{
-							"match": "\\w+",
-							"name": "constant.other.enum.java"
+							"begin": "(?<={)",
+							"end": "(?=;|})",
+							"patterns": [
+								{
+									"include": "#comments-javadoc"
+								},
+								{
+									"include": "#comments"
+								},
+								{
+									"begin": "(\\w+)\\s*(\\()",
+									"beginCaptures": {
+										"1": {
+											"name": "constant.other.enum.java"
+										},
+										"2": {
+											"name": "punctuation.bracket.round.java"
+										}
+									},
+									"end": "\\)",
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.bracket.round.java"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#code"
+										}
+									]
+								},
+								{
+									"match": "\\b\\w+\\b",
+									"name": "constant.other.enum.java"
+								}
+							]
 						},
 						{
 							"include": "#class-body"
 						}
 					]
-				},
-				{
-					"include": "#comments"
 				}
 			]
 		},
@@ -1458,7 +1496,7 @@
 			]
 		},
 		"variables": {
-			"begin": "(?x)\n(?=\n  (\n    (void|boolean|byte|char|short|int|float|long|double)\n    |\n    (?>(\\w+\\.)*[A-Z]+\\w*) # e.g. `javax.ws.rs.Response`, or `String`\n  )\n  (\n    <[\\w<>,\\.?\\s\\[\\]]*> # e.g. `HashMap<Integer, String>`, or `List<java.lang.String>`\n  )?\n  (\n    (\\[\\])* # int[][]\n  )?\n  \\s+\n  [A-Za-z_$][\\w$]* # At least one identifier after space\n  ([\\w\\[\\],$][\\w\\[\\],\\s]*)? # possibly primitive array or additional identifiers\n  \\s*(=|;)\n)",
+			"begin": "(?x)\n(?=\n  (\n    \\b(void|boolean|byte|char|short|int|float|long|double)\\b\n    |\n    (?>(\\w+\\.)*[A-Z]+\\w*) # e.g. `javax.ws.rs.Response`, or `String`\n  )\n  (\n    <[\\w<>,\\.?\\s\\[\\]]*> # e.g. `HashMap<Integer, String>`, or `List<java.lang.String>`\n  )?\n  (\n    (\\[\\])* # int[][]\n  )?\n  \\s+\n  [A-Za-z_$][\\w$]* # At least one identifier after space\n  ([\\w\\[\\],$][\\w\\[\\],\\s]*)? # possibly primitive array or additional identifiers\n  \\s*(=|;)\n)",
 			"end": "(?=\\=|;)",
 			"name": "meta.definition.variable.java",
 			"patterns": [