diff --git a/packages/languages/data/grammars/java.json b/packages/languages/data/grammars/java.json
index 0e29ea4e8..3cfa6f563 100644
--- a/packages/languages/data/grammars/java.json
+++ b/packages/languages/data/grammars/java.json
@@ -1,102 +1,110 @@
 {
-	"fileTypes": [
-		"java",
-		"bsh"
+	"information_for_contributors": [
+		"This file has been converted from https://github.com/atom/language-java/blob/master/grammars/java.cson",
+		"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."
 	],
-	"keyEquivalent": "^~J",
+	"version": "https://github.com/atom/language-java/commit/2e179ceac423403eb5bf0eff26884093c3edba6f",
 	"name": "Java",
+	"scopeName": "source.java",
 	"patterns": [
 		{
-			"captures": {
-				"1": {
-					"name": "keyword.other.package.java"
-				},
-				"2": {
-					"name": "storage.modifier.package.java"
-				},
-				"3": {
-					"name": "punctuation.terminator.java"
-				}
-			},
-			"match": "^\\s*(package)\\b(?:\\s*([^ ;$]+)\\s*(;)?)?",
-			"name": "meta.package.java"
-		},
-		{
-			"begin": "(import static)\\b\\s*",
+			"begin": "\\b(package)\\b\\s*",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.other.import.static.java"
-				}
-			},
-			"captures": {
-				"1": {
-					"name": "keyword.other.import.java"
-				},
-				"2": {
-					"name": "storage.modifier.import.java"
-				},
-				"3": {
-					"name": "punctuation.terminator.java"
+					"name": "keyword.other.package.java"
 				}
 			},
-			"contentName": "storage.modifier.import.java",
-			"end": "\\s*(?:$|(;))",
+			"end": "\\s*(;)",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.terminator.java"
 				}
 			},
-			"name": "meta.import.java",
+			"name": "meta.package.java",
+			"contentName": "storage.modifier.package.java",
 			"patterns": [
 				{
-					"match": "\\.",
-					"name": "punctuation.separator.java"
+					"include": "#comments"
+				},
+				{
+					"match": "(?<=\\.)\\s*\\.|\\.(?=\\s*;)",
+					"name": "invalid.illegal.character_not_allowed_here.java"
+				},
+				{
+					"match": "(?<!_)_(?=\\s*(\\.|;))|\\b\\d+|-+",
+					"name": "invalid.illegal.character_not_allowed_here.java"
+				},
+				{
+					"match": "[A-Z]+",
+					"name": "invalid.deprecated.package_name_not_lowercase.java"
 				},
 				{
-					"match": "\\s",
+					"match": "(?x)\\b(?<!\\$)\n(abstract|assert|boolean|break|byte|case|catch|char|class|\nconst|continue|default|do|double|else|enum|extends|final|\nfinally|float|for|goto|if|implements|import|instanceof|int|\ninterface|long|native|new|package|private|protected|public|\nreturn|short|static|strictfp|super|switch|syncronized|this|\nthrow|throws|transient|try|void|volatile|while|\ntrue|false|null)\\b",
 					"name": "invalid.illegal.character_not_allowed_here.java"
+				},
+				{
+					"match": "\\.",
+					"name": "punctuation.separator.java"
 				}
 			]
 		},
 		{
-			"begin": "(import)\\b\\s*",
+			"begin": "\\b(import)\\b\\s*\\b(static)?\\b\\s",
 			"beginCaptures": {
-				"1": {
-					"name": "keyword.other.import.java"
-				}
-			},
-			"captures": {
 				"1": {
 					"name": "keyword.other.import.java"
 				},
 				"2": {
-					"name": "storage.modifier.import.java"
-				},
-				"3": {
-					"name": "punctuation.terminator.java"
+					"name": "storage.modifier.java"
 				}
 			},
-			"contentName": "storage.modifier.import.java",
-			"end": "\\s*(?:$|(;))",
+			"end": "\\s*(;)",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.terminator.java"
 				}
 			},
 			"name": "meta.import.java",
+			"contentName": "storage.modifier.import.java",
 			"patterns": [
+				{
+					"include": "#comments"
+				},
+				{
+					"match": "(?<=\\.)\\s*\\.|\\.(?=\\s*;)",
+					"name": "invalid.illegal.character_not_allowed_here.java"
+				},
+				{
+					"match": "(?<!\\.)\\s*\\*",
+					"name": "invalid.illegal.character_not_allowed_here.java"
+				},
+				{
+					"match": "(?<!_)_(?=\\s*(\\.|;))|\\b\\d+|-+",
+					"name": "invalid.illegal.character_not_allowed_here.java"
+				},
+				{
+					"match": "(?x)\\b(?<!\\$)\n(abstract|assert|boolean|break|byte|case|catch|char|class|\nconst|continue|default|do|double|else|enum|extends|final|\nfinally|float|for|goto|if|implements|import|instanceof|int|\ninterface|long|native|new|package|private|protected|public|\nreturn|short|static|strictfp|super|switch|syncronized|this|\nthrow|throws|transient|try|void|volatile|while|\ntrue|false|null)\\b",
+					"name": "invalid.illegal.character_not_allowed_here.java"
+				},
 				{
 					"match": "\\.",
 					"name": "punctuation.separator.java"
 				},
 				{
-					"match": "\\s",
-					"name": "invalid.illegal.character_not_allowed_here.java"
+					"match": "\\*",
+					"name": "variable.language.wildcard.java"
 				}
 			]
 		},
+		{
+			"include": "#comments-javadoc"
+		},
 		{
 			"include": "#code"
+		},
+		{
+			"include": "#module"
 		}
 	],
 	"repository": {
@@ -116,19 +124,22 @@
 		"annotations": {
 			"patterns": [
 				{
-					"begin": "(@[^ (]+)(\\()",
+					"begin": "((@)\\s*([^\\s(]+))(\\()",
 					"beginCaptures": {
-						"1": {
+						"2": {
+							"name": "punctuation.definition.annotation.java"
+						},
+						"3": {
 							"name": "storage.type.annotation.java"
 						},
-						"2": {
-							"name": "punctuation.definition.annotation-arguments.begin.java"
+						"4": {
+							"name": "punctuation.definition.annotation-arguments.begin.bracket.round.java"
 						}
 					},
-					"end": "(\\))",
+					"end": "\\)",
 					"endCaptures": {
-						"1": {
-							"name": "punctuation.definition.annotation-arguments.end.java"
+						"0": {
+							"name": "punctuation.definition.annotation-arguments.end.bracket.round.java"
 						}
 					},
 					"name": "meta.declaration.annotation.java",
@@ -146,16 +157,48 @@
 						},
 						{
 							"include": "#code"
-						},
-						{
-							"match": ",",
-							"name": "punctuation.separator.property.java"
 						}
 					]
 				},
 				{
-					"match": "@\\w*",
-					"name": "storage.type.annotation.java"
+					"match": "(@)(interface)\\s+(\\w*)|((@)\\s*(\\w+))",
+					"name": "meta.declaration.annotation.java",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.annotation.java"
+						},
+						"2": {
+							"name": "storage.modifier.java"
+						},
+						"3": {
+							"name": "storage.type.annotation.java"
+						},
+						"5": {
+							"name": "punctuation.definition.annotation.java"
+						},
+						"6": {
+							"name": "storage.type.annotation.java"
+						}
+					}
+				}
+			]
+		},
+		"anonymous-block-and-instance-initializer": {
+			"begin": "{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.block.begin.bracket.curly.java"
+				}
+			},
+			"end": "}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.block.end.bracket.curly.java"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#code"
 				}
 			]
 		},
@@ -166,62 +209,67 @@
 					"name": "keyword.control.new.java"
 				}
 			},
-			"end": "(?<=\\)|\\])(?!\\s*{)|(?<=})|(?=;)",
+			"end": "(?=;|\\)|\\]|\\.|,|\\?|:|}|\\+|\\-|\\*|\\/(?!\\/|\\*)|%|!|&|\\||\\^|=)",
 			"patterns": [
 				{
-					"begin": "(\\w+)\\s*(?=\\[)",
-					"beginCaptures": {
-						"1": {
-							"name": "storage.type.java"
-						}
-					},
-					"end": "(})|(?=\\s*(?:,|;|\\)))",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.section.block.end.java"
-						}
-					},
+					"include": "#comments"
+				},
+				{
+					"include": "#function-call"
+				},
+				{
+					"include": "#all-types"
+				},
+				{
+					"begin": "(?<=\\))",
+					"end": "(?=;|\\)|\\]|\\.|,|\\?|:|}|\\+|\\-|\\*|\\/(?!\\/|\\*)|%|!|&|\\||\\^|=)",
 					"patterns": [
 						{
-							"begin": "\\[",
-							"end": "\\]",
-							"patterns": [
-								{
-									"include": "#code"
-								}
-							]
+							"include": "#comments"
 						},
 						{
 							"begin": "{",
 							"beginCaptures": {
 								"0": {
-									"name": "punctuation.section.block.begin.java"
+									"name": "punctuation.section.inner-class.begin.bracket.curly.java"
 								}
 							},
-							"end": "(?=})",
+							"end": "}",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.inner-class.end.bracket.curly.java"
+								}
+							},
+							"name": "meta.inner-class.java",
 							"patterns": [
 								{
-									"include": "#code"
+									"include": "#class-body"
 								}
 							]
 						}
 					]
 				},
 				{
-					"begin": "(?=\\w.*\\()",
-					"end": "(?<=\\))",
+					"begin": "(?<=\\])",
+					"end": "(?=;|\\)|\\]|\\.|,|\\?|:|}|\\+|\\-|\\*|\\/(?!\\/|\\*)|%|!|&|\\||\\^|=)",
 					"patterns": [
 						{
-							"include": "#object-types"
+							"include": "#comments"
 						},
 						{
-							"begin": "\\(",
+							"begin": "{",
 							"beginCaptures": {
-								"1": {
-									"name": "storage.type.java"
+								"0": {
+									"name": "punctuation.section.array-initializer.begin.bracket.curly.java"
 								}
 							},
-							"end": "\\)",
+							"end": "}",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.array-initializer.end.bracket.curly.java"
+								}
+							},
+							"name": "meta.array-initializer.java",
 							"patterns": [
 								{
 									"include": "#code"
@@ -231,24 +279,7 @@
 					]
 				},
 				{
-					"begin": "{",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.section.inner-class.begin.java"
-						}
-					},
-					"end": "}",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.section.inner-class.end.java"
-						}
-					},
-					"name": "meta.inner-class.java",
-					"patterns": [
-						{
-							"include": "#class-body"
-						}
-					]
+					"include": "#parens"
 				}
 			]
 		},
@@ -266,7 +297,7 @@
 					"patterns": [
 						{
 							"match": ":",
-							"name": "keyword.operator.assert.expression-seperator.java"
+							"name": "keyword.operator.assert.expression-separator.java"
 						},
 						{
 							"include": "#code"
@@ -276,11 +307,11 @@
 			]
 		},
 		"class": {
-			"begin": "(?=\\w?[\\w\\s]*(?:class|(?:@)?interface|enum)\\s+\\w+)",
+			"begin": "(?=\\w?[\\w\\s]*\\b(?:class|(?<!@)interface|enum)\\s+[\\w$]+)",
 			"end": "}",
 			"endCaptures": {
 				"0": {
-					"name": "punctuation.section.class.end.java"
+					"name": "punctuation.section.class.end.bracket.curly.java"
 				}
 			},
 			"name": "meta.class.java",
@@ -288,6 +319,9 @@
 				{
 					"include": "#storage-modifiers"
 				},
+				{
+					"include": "#generics"
+				},
 				{
 					"include": "#comments"
 				},
@@ -300,7 +334,7 @@
 							"name": "entity.name.type.class.java"
 						}
 					},
-					"match": "(class|(?:@)?interface|enum)\\s+(\\w+)",
+					"match": "(class|(?<!@)interface|enum)\\s+([\\w$]+)",
 					"name": "meta.class.identifier.java"
 				},
 				{
@@ -343,11 +377,11 @@
 					"begin": "{",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.section.class.begin.java"
+							"name": "punctuation.section.class.begin.bracket.curly.java"
 						}
 					},
 					"end": "(?=})",
-					"name": "meta.class.body.java",
+					"contentName": "meta.class.body.java",
 					"patterns": [
 						{
 							"include": "#class-body"
@@ -358,20 +392,26 @@
 		},
 		"class-body": {
 			"patterns": [
+				{
+					"include": "#comments-javadoc"
+				},
 				{
 					"include": "#comments"
 				},
+				{
+					"include": "#enums"
+				},
 				{
 					"include": "#class"
 				},
 				{
-					"include": "#enums"
+					"include": "#generics"
 				},
 				{
-					"include": "#variables"
+					"include": "#static-initializer"
 				},
 				{
-					"include": "#methods"
+					"include": "#class-fields-and-methods"
 				},
 				{
 					"include": "#annotations"
@@ -379,37 +419,52 @@
 				{
 					"include": "#storage-modifiers"
 				},
+				{
+					"include": "#member-variables"
+				},
 				{
 					"include": "#code"
 				}
 			]
 		},
+		"class-fields-and-methods": {
+			"patterns": [
+				{
+					"begin": "(?=\\=)",
+					"end": "(?=;)",
+					"patterns": [
+						{
+							"include": "#code"
+						}
+					]
+				},
+				{
+					"include": "#methods"
+				}
+			]
+		},
 		"code": {
 			"patterns": [
+				{
+					"include": "#annotations"
+				},
 				{
 					"include": "#comments"
 				},
+				{
+					"include": "#enums"
+				},
 				{
 					"include": "#class"
 				},
 				{
-					"begin": "{",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.section.block.begin.java"
-						}
-					},
-					"end": "}",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.section.block.end.java"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#code"
-						}
-					]
+					"include": "#record"
+				},
+				{
+					"include": "#anonymous-block-and-instance-initializer"
+				},
+				{
+					"include": "#try-catch-finally"
 				},
 				{
 					"include": "#assertions"
@@ -420,11 +475,14 @@
 				{
 					"include": "#constants-and-special-vars"
 				},
+				{
+					"include": "#numbers"
+				},
 				{
 					"include": "#anonymous-classes-and-new"
 				},
 				{
-					"include": "#annotations"
+					"include": "#lambda-expression"
 				},
 				{
 					"include": "#keywords"
@@ -435,11 +493,38 @@
 				{
 					"include": "#method-call"
 				},
+				{
+					"include": "#function-call"
+				},
+				{
+					"include": "#variables"
+				},
+				{
+					"include": "#variables-local"
+				},
+				{
+					"include": "#objects"
+				},
+				{
+					"include": "#properties"
+				},
 				{
 					"include": "#strings"
 				},
 				{
 					"include": "#all-types"
+				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.delimiter.java"
+				},
+				{
+					"match": "\\.",
+					"name": "punctuation.separator.period.java"
+				},
+				{
+					"match": ";",
+					"name": "punctuation.terminator.java"
 				}
 			]
 		},
@@ -454,9 +539,6 @@
 					"match": "/\\*\\*/",
 					"name": "comment.block.empty.java"
 				},
-				{
-					"include": "text.html.javadoc"
-				},
 				{
 					"include": "#comments-inline"
 				}
@@ -497,102 +579,320 @@
 				}
 			]
 		},
-		"constants-and-special-vars": {
+		"comments-javadoc": {
 			"patterns": [
 				{
-					"match": "\\b(true|false|null)\\b",
-					"name": "constant.language.java"
-				},
-				{
-					"match": "\\b(this|super)\\b",
-					"name": "variable.language.java"
-				},
-				{
-					"match": "\\b0[xX]\\h([\\h_]*\\h)?[lL]?(?!\\w|\\.)",
-					"name": "constant.numeric.hex.java"
-				},
-				{
-					"match": "\\b0[0-7_]*[0-7][lL]?\\b",
-					"name": "constant.numeric.octal.java"
-				},
-				{
-					"match": "\\b0[bB][01]([01_]*[01])?[lL]?\\b",
-					"name": "constant.numeric.binary.java"
-				},
-				{
-					"match": "\\b(0|[1-9]([0-9_]*[0-9])?)[lL]?(?!\\w|\\.)",
-					"name": "constant.numeric.integer.java"
-				},
+					"begin": "^\\s*(/\\*\\*)(?!/)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.comment.java"
+						}
+					},
+					"end": "\\*/",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.comment.java"
+						}
+					},
+					"name": "comment.block.javadoc.java",
+					"patterns": [
+						{
+							"match": "@(author|deprecated|return|see|serial|since|version)\\b",
+							"name": "keyword.other.documentation.javadoc.java"
+						},
+						{
+							"match": "(@param)\\s+(\\S+)",
+							"captures": {
+								"1": {
+									"name": "keyword.other.documentation.javadoc.java"
+								},
+								"2": {
+									"name": "variable.parameter.java"
+								}
+							}
+						},
+						{
+							"match": "(@(?:exception|throws))\\s+(\\S+)",
+							"captures": {
+								"1": {
+									"name": "keyword.other.documentation.javadoc.java"
+								},
+								"2": {
+									"name": "entity.name.type.class.java"
+								}
+							}
+						},
+						{
+							"match": "{(@link)\\s+(\\S+)?#([\\w$]+\\s*\\([^\\(\\)]*\\)).*?}",
+							"captures": {
+								"1": {
+									"name": "keyword.other.documentation.javadoc.java"
+								},
+								"2": {
+									"name": "entity.name.type.class.java"
+								},
+								"3": {
+									"name": "variable.parameter.java"
+								}
+							}
+						}
+					]
+				}
+			]
+		},
+		"constants-and-special-vars": {
+			"patterns": [
 				{
-					"match": "(?x)\n\t\t\t\t\t\t(?<!\\w)\t\t\t\t\t\t\t\t\t\t# Ensure word boundry\n\t\t\t\t\t\t(?>\n\t\t\t\t\t\t\t0[xX]\t\t\t\t\t\t\t\t\t# Start literal\n\t\t\t\t\t\t\t(\\h([\\h_]*\\h)?)?\t\t\t\t\t\t# Optional Number\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t(?<=\\h)\\.\t\t\t\t\t\t\t# A number must exist on\n\t\t\t\t\t\t      | \\.(?=\\h)\t\t\t\t\t\t\t#   one side of the decimal\n\t\t\t\t\t\t      | (?<=\\h)\t\t\t\t\t\t\t\t# Decimal not required\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t(\\h([\\h_]*\\h)?)?\t\t\t\t\t\t# Optional Number\n\t\t\t\t\t\t\t[pP]\t\t\t\t\t\t\t\t\t# Exponent Indicator\n\t\t\t\t\t\t\t[+-]?(0|[1-9]([0-9_]*[0-9])?)\t\t\t# Signed Integer\n\t\t\t\t\t\t\t[fFdD]?\t\t\t\t\t\t\t\t\t# Float Type Suffix\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(?!\\w)\t\t\t\t\t\t\t\t\t\t# Ensure word boundry\n\t\t\t\t\t",
-					"name": "constant.numeric.hex-float.java"
+					"match": "\\b(true|false|null)\\b",
+					"name": "constant.language.java"
 				},
 				{
-					"match": "(?x)\n\t\t\t\t\t\t(?<!\\w)\t\t\t\t\t\t\t\t\t\t\t# Ensure word boundry\n\t\t\t\t\t\t(?>\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t(0|[1-9]([0-9_]*[0-9])?)\t\t\t\t# Leading digits\n\t\t\t\t\t\t\t\t(?=[eEfFdD.])\t\t\t\t\t\t\t# Allow for numbers without .\n\t\t\t\t\t\t\t)?\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t(?<=[0-9])(?=[eEfFdD])\t\t\t\t\t# Allow for numbers without .\n\t\t\t\t\t\t\t  | \\.\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t[0-9]([0-9_]*[0-9])?\t\t\t\t\t# Numbers after .\n\t\t\t\t\t\t\t)?\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t[eE][+-]?(0|[1-9]([0-9_]*[0-9])?)\t\t# Exponent\n\t\t\t\t\t\t\t)?\n\t\t\t\t\t\t\t[fFdD]?\t\t\t\t\t\t\t\t\t\t# Float Type Suffix\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(?!\\w)\t\t\t\t\t\t\t\t\t\t\t# Ensure word boundry\n\t\t\t\t\t",
-					"name": "constant.numeric.float.java"
+					"match": "\\bthis\\b",
+					"name": "variable.language.this.java"
 				},
 				{
-					"captures": {
-						"1": {
-							"name": "keyword.operator.dereference.java"
-						}
-					},
-					"match": "(\\.)?\\b([A-Z][A-Z0-9_]+)(?!<|\\.class|\\s*\\w+\\s*=)\\b",
-					"name": "constant.other.java"
+					"match": "\\bsuper\\b",
+					"name": "variable.language.java"
 				}
 			]
 		},
 		"enums": {
-			"begin": "^(?=\\s*[A-Z0-9_]+\\s*({|\\(|,))",
-			"end": "(?=;|})",
+			"begin": "^\\s*([\\w\\s]*)(enum)\\s+(\\w+)",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#storage-modifiers"
+						}
+					]
+				},
+				"2": {
+					"name": "storage.modifier.java"
+				},
+				"3": {
+					"name": "entity.name.type.enum.java"
+				}
+			},
+			"end": "}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.enum.end.bracket.curly.java"
+				}
+			},
+			"name": "meta.enum.java",
 			"patterns": [
 				{
-					"begin": "\\w+",
+					"begin": "\\b(extends)\\b",
 					"beginCaptures": {
-						"0": {
-							"name": "constant.other.enum.java"
+						"1": {
+							"name": "storage.modifier.extends.java"
 						}
 					},
-					"end": "(?=,|;|})",
-					"name": "meta.enum.java",
+					"end": "(?={|\\bimplements\\b)",
+					"name": "meta.definition.class.inherited.classes.java",
 					"patterns": [
 						{
-							"include": "#parens"
+							"include": "#object-types-inherited"
 						},
 						{
-							"begin": "{",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.section.enum.begin.java"
-								}
-							},
-							"end": "}",
-							"endCaptures": {
-								"0": {
-									"name": "punctuation.section.enum.end.java"
-								}
-							},
+							"include": "#comments"
+						}
+					]
+				},
+				{
+					"begin": "\\b(implements)\\b",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.implements.java"
+						}
+					},
+					"end": "(?={|\\bextends\\b)",
+					"name": "meta.definition.class.implemented.interfaces.java",
+					"patterns": [
+						{
+							"include": "#object-types-inherited"
+						},
+						{
+							"include": "#comments"
+						}
+					]
+				},
+				{
+					"begin": "{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.enum.begin.bracket.curly.java"
+						}
+					},
+					"end": "(?=})",
+					"patterns": [
+						{
+							"begin": "(?<={)",
+							"end": "(?=;|})",
 							"patterns": [
 								{
-									"include": "#class-body"
+									"include": "#comments-javadoc"
+								},
+								{
+									"include": "#comments"
+								},
+								{
+									"begin": "\\b(\\w+)\\b",
+									"beginCaptures": {
+										"1": {
+											"name": "constant.other.enum.java"
+										}
+									},
+									"end": "(,)|(?=;|})",
+									"endCaptures": {
+										"1": {
+											"name": "punctuation.separator.delimiter.java"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#comments-javadoc"
+										},
+										{
+											"include": "#comments"
+										},
+										{
+											"begin": "\\(",
+											"beginCaptures": {
+												"0": {
+													"name": "punctuation.bracket.round.java"
+												}
+											},
+											"end": "\\)",
+											"endCaptures": {
+												"0": {
+													"name": "punctuation.bracket.round.java"
+												}
+											},
+											"patterns": [
+												{
+													"include": "#code"
+												}
+											]
+										},
+										{
+											"begin": "{",
+											"beginCaptures": {
+												"0": {
+													"name": "punctuation.bracket.curly.java"
+												}
+											},
+											"end": "}",
+											"endCaptures": {
+												"0": {
+													"name": "punctuation.bracket.curly.java"
+												}
+											},
+											"patterns": [
+												{
+													"include": "#class-body"
+												}
+											]
+										}
+									]
 								}
 							]
+						},
+						{
+							"include": "#class-body"
 						}
 					]
+				}
+			]
+		},
+		"function-call": {
+			"begin": "([A-Za-z_$][\\w$]*)\\s*(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "entity.name.function.java"
 				},
+				"2": {
+					"name": "punctuation.definition.parameters.begin.bracket.round.java"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.parameters.end.bracket.round.java"
+				}
+			},
+			"name": "meta.function-call.java",
+			"patterns": [
 				{
-					"include": "#comments"
+					"include": "#code"
+				}
+			]
+		},
+		"generics": {
+			"begin": "<",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.bracket.angle.java"
+				}
+			},
+			"end": ">",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.bracket.angle.java"
+				}
+			},
+			"patterns": [
+				{
+					"match": "\\b(extends|super)\\b",
+					"name": "storage.modifier.$1.java"
 				},
 				{
-					"include": "#annotations"
+					"match": "(?<!\\.)([a-zA-Z$_][a-zA-Z0-9$_]*)(?=\\s*<)",
+					"captures": {
+						"1": {
+							"name": "storage.type.java"
+						}
+					}
+				},
+				{
+					"include": "#primitive-arrays"
+				},
+				{
+					"match": "[a-zA-Z$_][a-zA-Z0-9$_]*",
+					"name": "storage.type.generic.java"
+				},
+				{
+					"match": "\\?",
+					"name": "storage.type.generic.wildcard.java"
+				},
+				{
+					"match": "&",
+					"name": "punctuation.separator.types.java"
+				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.delimiter.java"
+				},
+				{
+					"match": "\\.",
+					"name": "punctuation.separator.period.java"
+				},
+				{
+					"include": "#parens"
+				},
+				{
+					"include": "#generics"
+				},
+				{
+					"include": "#comments"
 				}
 			]
 		},
 		"keywords": {
 			"patterns": [
 				{
-					"match": "\\b(try|catch|finally|throw)\\b",
-					"name": "keyword.control.catch-exception.java"
+					"match": "\\bthrow\\b",
+					"name": "keyword.control.throw.java"
 				},
 				{
 					"match": "\\?|:",
@@ -604,7 +904,7 @@
 				},
 				{
 					"match": "\\b(instanceof)\\b",
-					"name": "keyword.operator.java"
+					"name": "keyword.operator.instanceof.java"
 				},
 				{
 					"match": "(<<|>>>?|~|\\^)",
@@ -643,37 +943,58 @@
 					"name": "keyword.operator.bitwise.java"
 				},
 				{
-					"match": "(?<=\\S)\\.(?=\\S)",
-					"name": "keyword.operator.dereference.java"
+					"match": "\\b(const|goto)\\b",
+					"name": "keyword.reserved.java"
+				}
+			]
+		},
+		"lambda-expression": {
+			"patterns": [
+				{
+					"match": "->",
+					"name": "storage.type.function.arrow.java"
+				}
+			]
+		},
+		"member-variables": {
+			"begin": "(?=private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final)",
+			"end": "(?=\\=|;)",
+			"patterns": [
+				{
+					"include": "#storage-modifiers"
 				},
 				{
-					"match": ";",
-					"name": "punctuation.terminator.java"
+					"include": "#variables"
+				},
+				{
+					"include": "#primitive-arrays"
+				},
+				{
+					"include": "#object-types"
 				}
 			]
 		},
 		"method-call": {
-			"begin": "([\\w$]+)(\\()",
+			"begin": "(\\.)\\s*([A-Za-z_$][\\w$]*)\\s*(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "meta.method.java"
+					"name": "punctuation.separator.period.java"
 				},
 				"2": {
-					"name": "punctuation.definition.method-parameters.begin.java"
+					"name": "entity.name.function.java"
+				},
+				"3": {
+					"name": "punctuation.definition.parameters.begin.bracket.round.java"
 				}
 			},
 			"end": "\\)",
 			"endCaptures": {
 				"0": {
-					"name": "punctuation.definition.method-parameters.end.java"
+					"name": "punctuation.definition.parameters.end.bracket.round.java"
 				}
 			},
 			"name": "meta.method-call.java",
 			"patterns": [
-				{
-					"match": ",",
-					"name": "punctuation.definition.seperator.parameter.java"
-				},
 				{
 					"include": "#code"
 				}
@@ -684,7 +1005,7 @@
 			"end": "(})|(?=;)",
 			"endCaptures": {
 				"1": {
-					"name": "punctuation.section.method.end.java"
+					"name": "punctuation.section.method.end.bracket.curly.java"
 				}
 			},
 			"name": "meta.method.java",
@@ -693,47 +1014,48 @@
 					"include": "#storage-modifiers"
 				},
 				{
-					"begin": "(\\w+)\\s*\\(",
+					"begin": "(\\w+)\\s*(\\()",
 					"beginCaptures": {
 						"1": {
 							"name": "entity.name.function.java"
+						},
+						"2": {
+							"name": "punctuation.definition.parameters.begin.bracket.round.java"
 						}
 					},
 					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.parameters.end.bracket.round.java"
+						}
+					},
 					"name": "meta.method.identifier.java",
 					"patterns": [
 						{
 							"include": "#parameters"
 						},
+						{
+							"include": "#parens"
+						},
 						{
 							"include": "#comments"
 						}
 					]
 				},
 				{
-					"begin": "<",
-					"end": ">",
-					"name": "storage.type.token.java",
-					"patterns": [
-						{
-							"include": "#object-types"
-						},
-						{
-							"begin": "<",
-							"comment": "This is just to support <>'s with no actual type prefix",
-							"end": ">|[^\\w\\s,\\[\\]<]",
-							"name": "storage.type.generic.java"
-						}
-					]
+					"include": "#generics"
 				},
 				{
 					"begin": "(?=\\w.*\\s+\\w+\\s*\\()",
-					"end": "(?=\\w+\\s*\\()",
+					"end": "(?=\\s+\\w+\\s*\\()",
 					"name": "meta.method.return-type.java",
 					"patterns": [
 						{
 							"include": "#all-types"
 						},
+						{
+							"include": "#parens"
+						},
 						{
 							"include": "#comments"
 						}
@@ -746,11 +1068,11 @@
 					"begin": "{",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.section.method.begin.java"
+							"name": "punctuation.section.method.begin.bracket.curly.java"
 						}
 					},
 					"end": "(?=})",
-					"name": "meta.method.body.java",
+					"contentName": "meta.method.body.java",
 					"patterns": [
 						{
 							"include": "#code"
@@ -762,136 +1084,466 @@
 				}
 			]
 		},
-		"object-types": {
+		"module": {
+			"begin": "((open)\\s)?(module)\\s+(\\w+)",
+			"end": "}",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.modifier.java"
+				},
+				"3": {
+					"name": "storage.modifier.java"
+				},
+				"4": {
+					"name": "entity.name.type.module.java"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.module.end.bracket.curly.java"
+				}
+			},
+			"name": "meta.module.java",
 			"patterns": [
 				{
-					"begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)<",
-					"end": ">|[^\\w\\s,\\?<\\[\\]]",
-					"name": "storage.type.generic.java",
+					"begin": "{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.module.begin.bracket.curly.java"
+						}
+					},
+					"end": "(?=})",
+					"contentName": "meta.module.body.java",
 					"patterns": [
 						{
-							"include": "#object-types"
-						},
-						{
-							"begin": "<",
-							"comment": "This is just to support <>'s with no actual type prefix",
-							"end": ">|[^\\w\\s,\\[\\]<]",
-							"name": "storage.type.generic.java"
+							"match": "\\b(requires|transitive|exports|opens|to|uses|provides|with)\\b",
+							"name": "keyword.module.java"
 						}
 					]
+				}
+			]
+		},
+		"numbers": {
+			"patterns": [
+				{
+					"match": "(?x)\n\\b(?<!\\$)\n0(x|X)\n(\n  (?<!\\.)[0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?[Ll]?(?!\\.)\n  |\n  (\n    [0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?\\.?\n    |\n    ([0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?)?\\.[0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?\n  )\n  [Pp][+-]?[0-9]([0-9_]*[0-9])?[FfDd]?\n)\n\\b(?!\\$)",
+					"name": "constant.numeric.hex.java"
 				},
 				{
-					"begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)(?=\\[)",
-					"end": "(?=[^\\]\\s])",
-					"name": "storage.type.object.array.java",
-					"patterns": [
-						{
-							"begin": "\\[",
-							"end": "\\]",
-							"patterns": [
-								{
-									"include": "#code"
+					"match": "\\b(?<!\\$)0(b|B)[01]([01_]*[01])?[Ll]?\\b(?!\\$)",
+					"name": "constant.numeric.binary.java"
+				},
+				{
+					"match": "\\b(?<!\\$)0[0-7]([0-7_]*[0-7])?[Ll]?\\b(?!\\$)",
+					"name": "constant.numeric.octal.java"
+				},
+				{
+					"match": "(?x)\n(?<!\\$)\n(\n  \\b[0-9]([0-9_]*[0-9])?\\.\\B(?!\\.)\n  |\n  \\b[0-9]([0-9_]*[0-9])?\\.([Ee][+-]?[0-9]([0-9_]*[0-9])?)[FfDd]?\\b\n  |\n  \\b[0-9]([0-9_]*[0-9])?\\.([Ee][+-]?[0-9]([0-9_]*[0-9])?)?[FfDd]\\b\n  |\n  \\b[0-9]([0-9_]*[0-9])?\\.([0-9]([0-9_]*[0-9])?)([Ee][+-]?[0-9]([0-9_]*[0-9])?)?[FfDd]?\\b\n  |\n  (?<!\\.)\\B\\.[0-9]([0-9_]*[0-9])?([Ee][+-]?[0-9]([0-9_]*[0-9])?)?[FfDd]?\\b\n  |\n  \\b[0-9]([0-9_]*[0-9])?([Ee][+-]?[0-9]([0-9_]*[0-9])?)[FfDd]?\\b\n  |\n  \\b[0-9]([0-9_]*[0-9])?([Ee][+-]?[0-9]([0-9_]*[0-9])?)?[FfDd]\\b\n  |\n  \\b(0|[1-9]([0-9_]*[0-9])?)(?!\\.)[Ll]?\\b\n)\n(?!\\$)",
+					"name": "constant.numeric.decimal.java"
+				}
+			]
+		},
+		"object-types": {
+			"patterns": [
+				{
+					"include": "#generics"
+				},
+				{
+					"begin": "\\b((?:[A-Za-z_]\\w*\\s*\\.\\s*)*)([A-Z_]\\w*)\\s*(?=\\[)",
+					"beginCaptures": {
+						"1": {
+							"patterns": [
+								{
+									"match": "[A-Za-z_]\\w*",
+									"name": "storage.type.java"
+								},
+								{
+									"match": "\\.",
+									"name": "punctuation.separator.period.java"
 								}
 							]
+						},
+						"2": {
+							"name": "storage.type.object.array.java"
+						}
+					},
+					"end": "(?!\\s*\\[)",
+					"patterns": [
+						{
+							"include": "#comments"
+						},
+						{
+							"include": "#parens"
 						}
 					]
 				},
 				{
+					"match": "\\b((?:[A-Za-z_]\\w*\\s*\\.\\s*)*[A-Z_]\\w*)\\s*(?=<)",
 					"captures": {
 						"1": {
-							"name": "keyword.operator.dereference.java"
+							"patterns": [
+								{
+									"match": "[A-Za-z_]\\w*",
+									"name": "storage.type.java"
+								},
+								{
+									"match": "\\.",
+									"name": "punctuation.separator.period.java"
+								}
+							]
 						}
-					},
-					"match": "\\b(?:[a-z]\\w*(\\.))*[A-Z]+\\w*\\b",
-					"name": "storage.type.java"
+					}
+				},
+				{
+					"match": "\\b((?:[A-Za-z_]\\w*\\s*\\.\\s*)*[A-Z_]\\w*)\\b((?=\\s*[A-Za-z$_\\n])|(?=\\s*\\.\\.\\.))",
+					"captures": {
+						"1": {
+							"patterns": [
+								{
+									"match": "[A-Za-z_]\\w*",
+									"name": "storage.type.java"
+								},
+								{
+									"match": "\\.",
+									"name": "punctuation.separator.period.java"
+								}
+							]
+						}
+					}
 				}
 			]
 		},
 		"object-types-inherited": {
 			"patterns": [
 				{
-					"begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)<",
-					"end": ">|[^\\w\\s,<]",
-					"name": "entity.other.inherited-class.java",
-					"patterns": [
-						{
-							"include": "#object-types"
-						},
-						{
-							"begin": "<",
-							"comment": "This is just to support <>'s with no actual type prefix",
-							"end": ">|[^\\w\\s,<]",
-							"name": "storage.type.generic.java"
-						}
-					]
+					"include": "#generics"
 				},
 				{
+					"match": "\\b(?:[A-Z]\\w*\\s*(\\.)\\s*)*[A-Z]\\w*\\b",
+					"name": "entity.other.inherited-class.java",
 					"captures": {
 						"1": {
-							"name": "keyword.operator.dereference.java"
+							"name": "punctuation.separator.period.java"
 						}
-					},
-					"match": "\\b(?:[a-z]\\w*(\\.))*[A-Z]+\\w*",
-					"name": "entity.other.inherited-class.java"
+					}
+				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.delimiter.java"
 				}
 			]
 		},
+		"objects": {
+			"match": "(?<![\\w$])[a-zA-Z_$][\\w$]*(?=\\s*\\.\\s*[\\w$]+)",
+			"name": "variable.other.object.java"
+		},
 		"parameters": {
 			"patterns": [
 				{
-					"match": "final",
+					"match": "\\bfinal\\b",
 					"name": "storage.modifier.java"
 				},
 				{
 					"include": "#annotations"
 				},
 				{
-					"include": "#primitive-arrays"
-				},
-				{
-					"include": "#primitive-types"
+					"include": "#all-types"
 				},
 				{
-					"include": "#object-types"
+					"include": "#strings"
 				},
 				{
 					"match": "\\w+",
 					"name": "variable.parameter.java"
+				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.delimiter.java"
+				},
+				{
+					"match": "\\.\\.\\.",
+					"name": "punctuation.definition.parameters.varargs.java"
 				}
 			]
 		},
 		"parens": {
-			"begin": "\\(",
-			"end": "\\)",
 			"patterns": [
 				{
-					"include": "#code"
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.bracket.round.java"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.bracket.round.java"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#code"
+						}
+					]
+				},
+				{
+					"begin": "\\[",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.bracket.square.java"
+						}
+					},
+					"end": "\\]",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.bracket.square.java"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#code"
+						}
+					]
+				},
+				{
+					"begin": "{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.bracket.curly.java"
+						}
+					},
+					"end": "}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.bracket.curly.java"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#code"
+						}
+					]
 				}
 			]
 		},
 		"primitive-arrays": {
 			"patterns": [
 				{
-					"match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)(\\[\\])*\\b",
-					"name": "storage.type.primitive.array.java"
+					"begin": "\\b(void|boolean|byte|char|short|int|float|long|double)\\b\\s*(?=\\[)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.type.primitive.array.java"
+						}
+					},
+					"end": "(?!\\s*\\[)",
+					"patterns": [
+						{
+							"include": "#comments"
+						},
+						{
+							"include": "#parens"
+						}
+					]
 				}
 			]
 		},
 		"primitive-types": {
+			"match": "\\b(void|boolean|byte|char|short|int|float|long|double)\\b",
+			"name": "storage.type.primitive.java"
+		},
+		"properties": {
 			"patterns": [
 				{
-					"match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)\\b",
-					"name": "storage.type.primitive.java"
+					"match": "(\\.)\\s*([a-zA-Z_$][\\w$]*)(?=\\s*\\.\\s*[a-zA-Z_$][\\w$]*)",
+					"captures": {
+						"1": {
+							"name": "punctuation.separator.period.java"
+						},
+						"2": {
+							"name": "variable.other.object.property.java"
+						}
+					}
+				},
+				{
+					"match": "(\\.)\\s*([a-zA-Z_$][\\w$]*)",
+					"captures": {
+						"1": {
+							"name": "punctuation.separator.period.java"
+						},
+						"2": {
+							"name": "variable.other.object.property.java"
+						}
+					}
+				},
+				{
+					"match": "(\\.)\\s*([0-9][\\w$]*)",
+					"captures": {
+						"1": {
+							"name": "punctuation.separator.period.java"
+						},
+						"2": {
+							"name": "invalid.illegal.identifier.java"
+						}
+					}
 				}
 			]
 		},
-		"storage-modifiers": {
-			"captures": {
+		"record": {
+			"begin": "(?=\\w?[\\w\\s]*\\b(?:record)\\s+[\\w$]+)",
+			"end": "}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.class.end.bracket.curly.java"
+				}
+			},
+			"name": "meta.record.java",
+			"patterns": [
+				{
+					"include": "#storage-modifiers"
+				},
+				{
+					"include": "#generics"
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"begin": "(record)\\s+([\\w$]+)(<[\\w$]+>)?(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.java"
+						},
+						"2": {
+							"name": "entity.name.type.record.java"
+						},
+						"3": {
+							"patterns": [
+								{
+									"include": "#generics"
+								}
+							]
+						},
+						"4": {
+							"name": "punctuation.definition.parameters.begin.bracket.round.java"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.parameters.end.bracket.round.java"
+						}
+					},
+					"name": "meta.record.identifier.java",
+					"patterns": [
+						{
+							"include": "#code"
+						}
+					]
+				},
+				{
+					"begin": "(implements)\\s",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.implements.java"
+						}
+					},
+					"end": "(?=\\s*\\{)",
+					"name": "meta.definition.class.implemented.interfaces.java",
+					"patterns": [
+						{
+							"include": "#object-types-inherited"
+						},
+						{
+							"include": "#comments"
+						}
+					]
+				},
+				{
+					"include": "#record-body"
+				}
+			]
+		},
+		"record-body": {
+			"begin": "{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.class.begin.bracket.curly.java"
+				}
+			},
+			"end": "(?=})",
+			"name": "meta.record.body.java",
+			"patterns": [
+				{
+					"include": "#record-constructor"
+				},
+				{
+					"include": "#class-body"
+				}
+			]
+		},
+		"record-constructor": {
+			"begin": "(?!new)(?=[\\w<].*\\s+)(?=([^\\(=/]|/(?!/))+(?={))",
+			"end": "(})|(?=;)",
+			"endCaptures": {
 				"1": {
-					"name": "storage.modifier.java"
+					"name": "punctuation.section.method.end.bracket.curly.java"
 				}
 			},
-			"match": "\\b(public|private|protected|static|final|native|synchronized|volatile|abstract|threadsafe|transient|strictfp)\\b"
+			"name": "meta.method.java",
+			"patterns": [
+				{
+					"include": "#storage-modifiers"
+				},
+				{
+					"begin": "(\\w+)",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.java"
+						}
+					},
+					"end": "(?=\\s*{)",
+					"name": "meta.method.identifier.java",
+					"patterns": [
+						{
+							"include": "#comments"
+						}
+					]
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"begin": "{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.method.begin.bracket.curly.java"
+						}
+					},
+					"end": "(?=})",
+					"contentName": "meta.method.body.java",
+					"patterns": [
+						{
+							"include": "#code"
+						}
+					]
+				}
+			]
+		},
+		"static-initializer": {
+			"patterns": [
+				{
+					"include": "#anonymous-block-and-instance-initializer"
+				},
+				{
+					"match": "static",
+					"name": "storage.modifier.java"
+				}
+			]
+		},
+		"storage-modifiers": {
+			"match": "\\b(public|private|protected|static|final|native|synchronized|abstract|threadsafe|transient|volatile|default|strictfp)\\b",
+			"name": "storage.modifier.java"
 		},
 		"strings": {
 			"patterns": [
@@ -950,81 +1602,230 @@
 			"name": "meta.throwables.java",
 			"patterns": [
 				{
-					"include": "#object-types"
-				}
-			]
-		},
-		"values": {
-			"patterns": [
-				{
-					"include": "#strings"
-				},
-				{
-					"include": "#object-types"
+					"match": ",",
+					"name": "punctuation.separator.delimiter.java"
 				},
 				{
-					"include": "#constants-and-special-vars"
+					"match": "[a-zA-Z$_][\\.a-zA-Z0-9$_]*",
+					"name": "storage.type.java"
 				}
 			]
 		},
-		"variables": {
-			"applyEndPatternLast": 1,
+		"try-catch-finally": {
 			"patterns": [
 				{
-					"begin": "(?x:(?=\n                        (?:\n                            (?:private|protected|public|native|synchronized|volatile|abstract|threadsafe|transient|static|final) # visibility/modifier\n                                |\n                            (?:def)\n                                |\n                            (?:void|boolean|byte|char|short|int|float|long|double)\n                                |\n                            (?:(?:[a-z]\\w*\\.)*[A-Z]+\\w*) # object type\n                        )\n                        \\s+\n                        (?!private|protected|public|native|synchronized|volatile|abstract|threadsafe|transient|static|final|def|void|boolean|byte|char|short|int|float|long|double)\n                        [\\w\\d_<>\\[\\],\\?][\\w\\d_<>\\[\\],\\? \\t]*\n                        (?:=|$)\n                        \n\t\t\t\t\t))",
-					"end": "(?=;)",
-					"name": "meta.definition.variable.java",
+					"begin": "\\btry\\b",
+					"beginCaptures": {
+						"0": {
+							"name": "keyword.control.try.java"
+						}
+					},
+					"end": "}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.try.end.bracket.curly.java"
+						}
+					},
+					"name": "meta.try.java",
 					"patterns": [
 						{
-							"match": "\\s"
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.try.resources.begin.bracket.round.java"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.try.resources.end.bracket.round.java"
+								}
+							},
+							"name": "meta.try.resources.java",
+							"patterns": [
+								{
+									"include": "#code"
+								}
+							]
 						},
 						{
-							"captures": {
-								"1": {
-									"name": "constant.other.variable.java"
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.try.begin.bracket.curly.java"
 								}
 							},
-							"match": "([A-Z_0-9]+)\\s+(?=\\=)"
+							"end": "(?=})",
+							"contentName": "meta.try.body.java",
+							"patterns": [
+								{
+									"include": "#code"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "\\b(catch)\\b",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.catch.java"
+						}
+					},
+					"end": "}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.catch.end.bracket.curly.java"
+						}
+					},
+					"name": "meta.catch.java",
+					"patterns": [
+						{
+							"include": "#comments"
 						},
 						{
-							"captures": {
-								"1": {
-									"name": "meta.definition.variable.name.java"
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.parameters.begin.bracket.round.java"
 								}
 							},
-							"match": "(\\w[^\\s,]*)\\s+(?=\\=)"
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.parameters.end.bracket.round.java"
+								}
+							},
+							"contentName": "meta.catch.parameters.java",
+							"patterns": [
+								{
+									"include": "#comments"
+								},
+								{
+									"include": "#storage-modifiers"
+								},
+								{
+									"begin": "[a-zA-Z$_][\\.a-zA-Z0-9$_]*",
+									"beginCaptures": {
+										"0": {
+											"name": "storage.type.java"
+										}
+									},
+									"end": "(\\|)|(?=\\))",
+									"endCaptures": {
+										"1": {
+											"name": "punctuation.catch.separator.java"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#comments"
+										},
+										{
+											"match": "\\w+",
+											"captures": {
+												"0": {
+													"name": "variable.parameter.java"
+												}
+											}
+										}
+									]
+								}
+							]
 						},
 						{
-							"begin": "=",
+							"begin": "{",
 							"beginCaptures": {
 								"0": {
-									"name": "keyword.operator.assignment.java"
+									"name": "punctuation.section.catch.begin.bracket.curly.java"
 								}
 							},
-							"end": "(?=;)",
+							"end": "(?=})",
+							"contentName": "meta.catch.body.java",
 							"patterns": [
 								{
 									"include": "#code"
 								}
 							]
-						},
+						}
+					]
+				},
+				{
+					"begin": "\\bfinally\\b",
+					"beginCaptures": {
+						"0": {
+							"name": "keyword.control.finally.java"
+						}
+					},
+					"end": "}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.finally.end.bracket.curly.java"
+						}
+					},
+					"name": "meta.finally.java",
+					"patterns": [
 						{
-							"captures": {
-								"1": {
-									"name": "meta.definition.variable.name.java"
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.finally.begin.bracket.curly.java"
 								}
 							},
-							"match": "(\\w[^\\s=]*)(?=\\s*;)"
-						},
-						{
-							"include": "#code"
+							"end": "(?=})",
+							"contentName": "meta.finally.body.java",
+							"patterns": [
+								{
+									"include": "#code"
+								}
+							]
 						}
 					]
 				}
 			]
+		},
+		"variables": {
+			"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  \\s*\n  (\n    <[\\w<>,\\.?\\s\\[\\]]*> # e.g. `HashMap<Integer, String>`, or `List<java.lang.String>`\n  )?\n  \\s*\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": [
+				{
+					"match": "([A-Za-z$_][\\w$]*)(?=\\s*(\\[\\])*\\s*(;|:|=|,))",
+					"captures": {
+						"1": {
+							"name": "variable.other.definition.java"
+						}
+					}
+				},
+				{
+					"include": "#all-types"
+				},
+				{
+					"include": "#code"
+				}
+			]
+		},
+		"variables-local": {
+			"begin": "(?=\\b(var)\\b\\s+[A-Za-z_$][\\w$]*\\s*(=|:|;))",
+			"end": "(?=\\=|:|;)",
+			"name": "meta.definition.variable.local.java",
+			"patterns": [
+				{
+					"match": "\\bvar\\b",
+					"name": "storage.type.local.java"
+				},
+				{
+					"match": "([A-Za-z$_][\\w$]*)(?=\\s*(\\[\\])*\\s*(=|:|;))",
+					"captures": {
+						"1": {
+							"name": "variable.other.definition.java"
+						}
+					}
+				},
+				{
+					"include": "#code"
+				}
+			]
 		}
-	},
-	"scopeName": "source.java",
-	"uuid": "2B449DF6-6B1D-11D9-94EC-000D93589AF6",
-	"version": "https://github.com/textmate/java.tmbundle/commit/faffa518d0b22b68b4e5e6b4c939722522b97d40"
-}
+	}
+}
\ No newline at end of file