Fix enum highlighting

1 files changed, 63 insertions, 2 deletions

diff --git a/lib/java.tmLanguage.json b/lib/java.tmLanguage.json
index 1701e15..ee39a33 100644
--- a/lib/java.tmLanguage.json
+++ b/lib/java.tmLanguage.json
@@ -64,6 +64,9 @@
 		},
 		{
 			"include": "#class-declaration"
+		},
+		{
+			"include": "#enum-declaration"
 		}
 	],
 	"repository": {
@@ -109,8 +112,64 @@
 				}
 			]
 		},
+		"enum-declaration": {
+			"begin": "\\b(enum) +(\\w+)\\b",
+			"end": "$",
+			"name": "meta.enum.java",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.enum"
+				},
+				"2": {
+					"name": "entity.name.class.java"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "{",
+					"end": "}",
+					"name": "meta.enum.body",
+					"beginCaptures": {
+						"0": {
+							"name": "keyword.other.begin-enum-body"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "keyword.other.end-enum-body"
+						}
+					},
+					"patterns": [
+						{
+							"match": "\\w+",
+							"name": "variable.other.enum.constant"
+						},
+						{
+							"match": ",",
+							"name": "keyword.other"
+						},
+						{
+							"begin": ";",
+							"end": "(?=})",
+							"name": "meta.enum.body.java",
+							"beginCaptures": {
+								"0": {
+									"name": "keyword.other.begin-enum-methods"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#class-body"
+								}
+							]
+						}
+					]
+				}
+			]
+		},
 		"class-declaration": {
-			"begin": "(?<!\\.)\\b(class|interface|@interface)\\b +(\\w+)\\b",
+			"begin": "(?<!\\.)\\b(class|interface|@interface) +(\\w+)\\b",
+			"name": "meta.class.java",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.class"
@@ -120,7 +179,6 @@
 				}
 			},
 			"end": "$",
-			"name": "meta.class.java",
 			"patterns": [
 				{
 					"include": "#keywords"
@@ -172,6 +230,9 @@
 					"include": "#class-declaration"
 				},
 				{
+					"include": "#enum-declaration"
+				},
+				{
 					"match": "\\b(\\w+)(?=\\()",
 					"name": "variable.other.constructor.java"
 				},