From c33d2824cc5d07b3f82aaf89c8c93e5f0080d0cd Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Thu, 18 May 2017 12:04:18 +0200
Subject: [PATCH] [java] switch to atom/language-java grammar

---
 extensions/java/OSSREADME.json                |   43 +-
 extensions/java/package.json                  |    5 +-
 extensions/java/syntaxes/java.tmLanguage.json | 1089 +++++++++++------
 .../java/syntaxes/javadoc.tmLanguage.json     |  432 -------
 .../test/colorize-results/basic_java.json     |  737 ++++++-----
 extensions/theme-defaults/themes/dark_vs.json |    1 +
 .../themes/hc_black_defaults.json             |    6 +-
 .../theme-defaults/themes/light_vs.json       |    1 +
 8 files changed, 1143 insertions(+), 1171 deletions(-)
 delete mode 100644 extensions/java/syntaxes/javadoc.tmLanguage.json

diff --git a/extensions/java/OSSREADME.json b/extensions/java/OSSREADME.json
index 6a2da0d287b..c87e957510b 100644
--- a/extensions/java/OSSREADME.json
+++ b/extensions/java/OSSREADME.json
@@ -1,42 +1,9 @@
 // ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
 [{
-	"name": "textmate/java.tmbundle",
+	"name": "atom/language-java",
 	"version": "0.0.0",
-	"license": "TextMate Bundle License",
-	"repositoryURL": "https://github.com/textmate/java.tmbundle",
-	"licenseDetail": [
-		"Copyright (c) textmate-java.tmbundle project authors",
-		"",
-		"If not otherwise specified (see below), files in this repository fall under the following license:",
-		"",
-		"Permission to copy, use, modify, sell and distribute this",
-		"software is granted. This software is provided \"as is\" without",
-		"express or implied warranty, and with no claim as to its",
-		"suitability for any purpose.",
-		"",
-		"An exception is made for files in readable text which contain their own license information,",
-		"or files where an accompanying file exists (in the same directory) with a \"-license\" suffix added",
-		"to the base-name name of the original file, and an extension of txt, html, or similar. For example",
-		"\"tidy\" is accompanied by \"tidy-license.txt\"."
-	]
-},{
-	"name": "textmate/javadoc.tmbundle",
-	"version": "0.0.0",
-	"license": "TextMate Bundle License",
-	"repositoryURL": "https://github.com/textmate/javadoc.tmbundle",
-	"licenseDetail": [
-		"Copyright (c) textmate-javadoc.tmbundle project authors",
-		"",
-		"If not otherwise specified (see below), files in this repository fall under the following license:",
-		"",
-		"Permission to copy, use, modify, sell and distribute this",
-		"software is granted. This software is provided \"as is\" without",
-		"express or implied warranty, and with no claim as to its",
-		"suitability for any purpose.",
-		"",
-		"An exception is made for files in readable text which contain their own license information,",
-		"or files where an accompanying file exists (in the same directory) with a \"-license\" suffix added",
-		"to the base-name name of the original file, and an extension of txt, html, or similar. For example",
-		"\"tidy\" is accompanied by \"tidy-license.txt\"."
-	]
+	"license": "MIT",
+	"repositoryURL": "https://github.com/atom/language-java",
+	"description": "The file syntaxes/java.tmLanguage.json was derived from the Atom package https://github.com/atom/language-java which was originally converted from the TextMate bundle https://github.com/textmate/java.tmbundle."
+
 }]
diff --git a/extensions/java/package.json b/extensions/java/package.json
index ee0e7e616ab..d8c9375f0c3 100644
--- a/extensions/java/package.json
+++ b/extensions/java/package.json
@@ -4,7 +4,7 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js textmate/java.tmbundle Syntaxes/Java.plist ./syntaxes/java.tmLanguage.json && node ../../build/npm/update-grammar.js textmate/javadoc.tmbundle Syntaxes/JavaDoc.tmLanguage ./syntaxes/javadoc.tmLanguage.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-java grammars/java.cson ./syntaxes/java.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [{
@@ -17,9 +17,6 @@
 			"language": "java",
 			"scopeName": "source.java",
 			"path": "./syntaxes/java.tmLanguage.json"
-		},{
-			"scopeName": "text.html.javadoc",
-			"path": "./syntaxes/javadoc.tmLanguage.json"
 		}]
 	}
 }
\ No newline at end of file
diff --git a/extensions/java/syntaxes/java.tmLanguage.json b/extensions/java/syntaxes/java.tmLanguage.json
index f0fcef2d065..5d0513d49b0 100644
--- a/extensions/java/syntaxes/java.tmLanguage.json
+++ b/extensions/java/syntaxes/java.tmLanguage.json
@@ -1,99 +1,98 @@
 {
+	"scopeName": "source.java",
+	"name": "Java",
 	"fileTypes": [
 		"java",
 		"bsh"
 	],
-	"keyEquivalent": "^~J",
-	"name": "Java",
 	"patterns": [
 		{
-			"captures": {
+			"begin": "\\b(package)\\b\\s*",
+			"beginCaptures": {
 				"1": {
 					"name": "keyword.other.package.java"
-				},
-				"2": {
-					"name": "storage.modifier.package.java"
-				},
-				"3": {
+				}
+			},
+			"end": "\\s*(;)",
+			"endCaptures": {
+				"1": {
 					"name": "punctuation.terminator.java"
 				}
 			},
-			"match": "^\\s*(package)\\b(?:\\s*([^ ;$]+)\\s*(;)?)?",
-			"name": "meta.package.java"
+			"name": "meta.package.java",
+			"contentName": "storage.modifier.package.java",
+			"patterns": [
+				{
+					"include": "#comments"
+				},
+				{
+					"match": "(?<=\\.)\\s*\\.|\\.(?=\\s*;)",
+					"name": "invalid.illegal.character_not_allowed_here.java"
+				},
+				{
+					"match": "(?<!_)_(?=\\s*(\\.|;))|[A-Z]+|\\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"
+				}
+			]
 		},
 		{
-			"begin": "(import static)\\b\\s*",
+			"begin": "\\b(import)\\b\\s*\\b(static)?\\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": "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"
 				}
 			]
 		},
 		{
-			"begin": "(import)\\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"
-				}
-			},
-			"contentName": "storage.modifier.import.java",
-			"end": "\\s*(?:$|(;))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.terminator.java"
-				}
-			},
-			"name": "meta.import.java",
-			"patterns": [
-				{
-					"match": "\\.",
-					"name": "punctuation.separator.java"
-				},
-				{
-					"match": "\\s",
-					"name": "invalid.illegal.character_not_allowed_here.java"
-				}
-			]
+			"include": "#comments-javadoc"
 		},
 		{
 			"include": "#code"
@@ -122,13 +121,13 @@
 							"name": "storage.type.annotation.java"
 						},
 						"2": {
-							"name": "punctuation.definition.annotation-arguments.begin.java"
+							"name": "punctuation.definition.annotation-arguments.begin.bracket.round.java"
 						}
 					},
 					"end": "(\\))",
 					"endCaptures": {
 						"1": {
-							"name": "punctuation.definition.annotation-arguments.end.java"
+							"name": "punctuation.definition.annotation-arguments.end.bracket.round.java"
 						}
 					},
 					"name": "meta.declaration.annotation.java",
@@ -146,10 +145,6 @@
 						},
 						{
 							"include": "#code"
-						},
-						{
-							"match": ",",
-							"name": "punctuation.separator.property.java"
 						}
 					]
 				},
@@ -166,81 +161,25 @@
 					"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"
-						}
-					},
-					"patterns": [
-						{
-							"begin": "\\[",
-							"end": "\\]",
-							"patterns": [
-								{
-									"include": "#code"
-								}
-							]
-						},
-						{
-							"begin": "{",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.section.block.begin.java"
-								}
-							},
-							"end": "(?=})",
-							"patterns": [
-								{
-									"include": "#code"
-								}
-							]
-						}
-					]
+					"include": "#function-call"
 				},
 				{
-					"begin": "(?=\\w.*\\()",
-					"end": "(?<=\\))",
-					"patterns": [
-						{
-							"include": "#object-types"
-						},
-						{
-							"begin": "\\(",
-							"beginCaptures": {
-								"1": {
-									"name": "storage.type.java"
-								}
-							},
-							"end": "\\)",
-							"patterns": [
-								{
-									"include": "#code"
-								}
-							]
-						}
-					]
+					"include": "#all-types"
 				},
 				{
-					"begin": "{",
+					"begin": "(?<!\\])\\s*({)",
 					"beginCaptures": {
-						"0": {
-							"name": "punctuation.section.inner-class.begin.java"
+						"1": {
+							"name": "punctuation.section.inner-class.begin.bracket.curly.java"
 						}
 					},
 					"end": "}",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.section.inner-class.end.java"
+							"name": "punctuation.section.inner-class.end.bracket.curly.java"
 						}
 					},
 					"name": "meta.inner-class.java",
@@ -249,6 +188,9 @@
 							"include": "#class-body"
 						}
 					]
+				},
+				{
+					"include": "#parens"
 				}
 			]
 		},
@@ -266,7 +208,7 @@
 					"patterns": [
 						{
 							"match": ":",
-							"name": "keyword.operator.assert.expression-seperator.java"
+							"name": "keyword.operator.assert.expression-separator.java"
 						},
 						{
 							"include": "#code"
@@ -280,7 +222,7 @@
 			"end": "}",
 			"endCaptures": {
 				"0": {
-					"name": "punctuation.section.class.end.java"
+					"name": "punctuation.section.class.end.bracket.curly.java"
 				}
 			},
 			"name": "meta.class.java",
@@ -288,6 +230,9 @@
 				{
 					"include": "#storage-modifiers"
 				},
+				{
+					"include": "#generics"
+				},
 				{
 					"include": "#comments"
 				},
@@ -343,11 +288,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,6 +303,9 @@
 		},
 		"class-body": {
 			"patterns": [
+				{
+					"include": "#comments-javadoc"
+				},
 				{
 					"include": "#comments"
 				},
@@ -368,7 +316,10 @@
 					"include": "#enums"
 				},
 				{
-					"include": "#variables"
+					"include": "#generics"
+				},
+				{
+					"include": "#static-initializer"
 				},
 				{
 					"include": "#methods"
@@ -376,6 +327,9 @@
 				{
 					"include": "#annotations"
 				},
+				{
+					"include": "#member-variables"
+				},
 				{
 					"include": "#storage-modifiers"
 				},
@@ -384,32 +338,55 @@
 				}
 			]
 		},
+		"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"
+				}
+			]
+		},
+		"static-initializer": {
+			"patterns": [
+				{
+					"include": "#anonymous-block-and-instance-initializer"
+				},
+				{
+					"match": "static",
+					"name": "storage.modifier.java"
+				}
+			]
+		},
 		"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": "#anonymous-block-and-instance-initializer"
+				},
+				{
+					"include": "#try-catch-finally"
 				},
 				{
 					"include": "#assertions"
@@ -420,11 +397,14 @@
 				{
 					"include": "#constants-and-special-vars"
 				},
+				{
+					"include": "#numbers"
+				},
 				{
 					"include": "#anonymous-classes-and-new"
 				},
 				{
-					"include": "#annotations"
+					"include": "#lambda-expression"
 				},
 				{
 					"include": "#keywords"
@@ -435,11 +415,35 @@
 				{
 					"include": "#method-call"
 				},
+				{
+					"include": "#function-call"
+				},
+				{
+					"include": "#objects"
+				},
+				{
+					"include": "#properties"
+				},
+				{
+					"include": "#variables"
+				},
 				{
 					"include": "#strings"
 				},
 				{
 					"include": "#all-types"
+				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.delimiter.java"
+				},
+				{
+					"match": "\\.",
+					"name": "punctuation.separator.period.java"
+				},
+				{
+					"match": ";",
+					"name": "punctuation.terminator.java"
 				}
 			]
 		},
@@ -497,6 +501,207 @@
 				}
 			]
 		},
+		"comments-javadoc": {
+			"patterns": [
+				{
+					"begin": "^\\s*/\\*\\*",
+					"beginCaptures": {
+						"0": {
+							"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"
+								}
+							}
+						}
+					]
+				}
+			]
+		},
+		"try-catch-finally": {
+			"patterns": [
+				{
+					"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": [
+						{
+							"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"
+								}
+							]
+						},
+						{
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.try.begin.bracket.curly.java"
+								}
+							},
+							"end": "(?=})",
+							"contentName": "meta.try.body.java",
+							"patterns": [
+								{
+									"include": "#code"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "\\b(catch)\\b\\s*(?=\\(\\s*[^\\s]+\\s*[^)]+\\))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.catch.java"
+						}
+					},
+					"end": "}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.catch.end.bracket.curly.java"
+						}
+					},
+					"name": "meta.catch.java",
+					"patterns": [
+						{
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.parameters.begin.bracket.round.java"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.parameters.end.bracket.round.java"
+								}
+							},
+							"contentName": "meta.catch.parameters.java",
+							"patterns": [
+								{
+									"include": "#parameters"
+								}
+							]
+						},
+						{
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.catch.begin.bracket.curly.java"
+								}
+							},
+							"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": [
+						{
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.finally.begin.bracket.curly.java"
+								}
+							},
+							"end": "(?=})",
+							"contentName": "meta.finally.body.java",
+							"patterns": [
+								{
+									"include": "#code"
+								}
+							]
+						}
+					]
+				}
+			]
+		},
 		"constants-and-special-vars": {
 			"patterns": [
 				{
@@ -504,95 +709,137 @@
 					"name": "constant.language.java"
 				},
 				{
-					"match": "\\b(this|super)\\b",
+					"match": "\\bthis\\b",
+					"name": "variable.language.this.java"
+				},
+				{
+					"match": "\\bsuper\\b",
 					"name": "variable.language.java"
+				}
+			]
+		},
+		"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"
 				},
 				{
-					"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"
-				},
-				{
-					"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": "(?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": "([a-zA-Z$_][a-zA-Z0-9$_]*)(?=\\s*<)",
 					"captures": {
 						"1": {
-							"name": "keyword.operator.dereference.java"
+							"name": "storage.type.java"
 						}
-					},
-					"match": "(\\.)?\\b([A-Z][A-Z0-9_]+)(?!<|\\.class|\\s*\\w+\\s*=)\\b",
-					"name": "constant.other.java"
+					}
+				},
+				{
+					"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"
+				},
+				{
+					"include": "#parens"
+				},
+				{
+					"include": "#generics"
+				},
+				{
+					"include": "#comments"
 				}
 			]
 		},
 		"enums": {
-			"begin": "^(?=\\s*[A-Z0-9_]+\\s*({|\\(|,))",
-			"end": "(?=;|})",
+			"begin": "^\\s*(enum)\\s+(\\w+)",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.modifier.java"
+				},
+				"2": {
+					"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": "{",
 					"beginCaptures": {
 						"0": {
-							"name": "constant.other.enum.java"
+							"name": "punctuation.section.enum.begin.bracket.curly.java"
 						}
 					},
-					"end": "(?=,|;|})",
-					"name": "meta.enum.java",
+					"end": "(?=})",
 					"patterns": [
 						{
-							"include": "#parens"
+							"match": "\\w+",
+							"name": "constant.other.enum.java"
 						},
 						{
-							"begin": "{",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.section.enum.begin.java"
-								}
-							},
-							"end": "}",
-							"endCaptures": {
-								"0": {
-									"name": "punctuation.section.enum.end.java"
-								}
-							},
-							"patterns": [
-								{
-									"include": "#class-body"
-								}
-							]
+							"include": "#class-body"
 						}
 					]
 				},
 				{
 					"include": "#comments"
+				}
+			]
+		},
+		"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": "#annotations"
+					"include": "#code"
 				}
 			]
 		},
 		"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 +851,7 @@
 				},
 				{
 					"match": "\\b(instanceof)\\b",
-					"name": "keyword.operator.java"
+					"name": "keyword.operator.instanceof.java"
 				},
 				{
 					"match": "(<<|>>>?|~|\\^)",
@@ -641,39 +888,38 @@
 				{
 					"match": "(\\||&)",
 					"name": "keyword.operator.bitwise.java"
-				},
+				}
+			]
+		},
+		"lambda-expression": {
+			"patterns": [
 				{
-					"match": "(?<=\\S)\\.(?=\\S)",
-					"name": "keyword.operator.dereference.java"
-				},
-				{
-					"match": ";",
-					"name": "punctuation.terminator.java"
+					"match": "->",
+					"name": "storage.type.function.arrow.java"
 				}
 			]
 		},
 		"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 +930,7 @@
 			"end": "(})|(?=;)",
 			"endCaptures": {
 				"1": {
-					"name": "punctuation.section.method.end.java"
+					"name": "punctuation.section.method.end.bracket.curly.java"
 				}
 			},
 			"name": "meta.method.java",
@@ -693,49 +939,47 @@
 					"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": "#comments"
+							"include": "#parens"
+						},
+						{
+							"include": "#comments-inline"
 						}
 					]
 				},
 				{
-					"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": "#comments"
+							"include": "#parens"
 						}
 					]
 				},
@@ -746,11 +990,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 +1006,251 @@
 				}
 			]
 		},
+		"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"
+				},
+				{
+					"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": [
 				{
-					"begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)<",
-					"end": ">|[^\\w\\s,\\?<\\[\\]]",
-					"name": "storage.type.generic.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": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)(?=\\[)",
-					"end": "(?=[^\\]\\s])",
-					"name": "storage.type.object.array.java",
-					"patterns": [
-						{
-							"begin": "\\[",
-							"end": "\\]",
-							"patterns": [
-								{
-									"include": "#code"
-								}
-							]
-						}
-					]
-				},
-				{
-					"captures": {
+					"begin": "\\b(?:[A-Z]\\w*\\s*(\\.)\\s*)*([A-Z]\\w*)\\s*(?=\\[)",
+					"beginCaptures": {
 						"1": {
-							"name": "keyword.operator.dereference.java"
+							"name": "punctuation.separator.period.java"
+						},
+						"2": {
+							"name": "storage.type.object.array.java"
 						}
 					},
-					"match": "\\b(?:[a-z]\\w*(\\.))*[A-Z]+\\w*\\b",
-					"name": "storage.type.java"
+					"end": "(?!\\s*\\[)",
+					"patterns": [
+						{
+							"include": "#comments"
+						},
+						{
+							"include": "#parens"
+						}
+					]
+				},
+				{
+					"begin": "\\b(?:[A-Z]\\w*\\s*(\\.)\\s*)*[A-Z]\\w*\\s*(?=<)",
+					"beginCaptures": {
+						"0": {
+							"name": "storage.type.java"
+						},
+						"1": {
+							"name": "punctuation.separator.period.java"
+						}
+					},
+					"end": "(?<=>)",
+					"patterns": [
+						{
+							"include": "#generics"
+						}
+					]
+				},
+				{
+					"match": "\\b(?:[A-Z]\\w*\\s*(\\.)\\s*)*[A-Z]\\w*\\b",
+					"name": "storage.type.java",
+					"captures": {
+						"1": {
+							"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": "#object-types"
+					"include": "#all-types"
 				},
 				{
 					"match": "\\w+",
 					"name": "variable.parameter.java"
+				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.delimiter.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.property.java"
+						}
+					}
+				},
+				{
+					"match": "(\\.)\\s*([0-9][\\w$]*)",
+					"captures": {
+						"1": {
+							"name": "punctuation.separator.period.java"
+						},
+						"2": {
+							"name": "invalid.illegal.identifier.java"
+						}
+					}
 				}
 			]
 		},
 		"storage-modifiers": {
-			"captures": {
-				"1": {
-					"name": "storage.modifier.java"
-				}
-			},
-			"match": "\\b(public|private|protected|static|final|native|synchronized|volatile|abstract|threadsafe|transient)\\b"
+			"match": "\\b(public|private|protected|static|final|native|synchronized|abstract|threadsafe|transient|volatile|default|strictfp)\\b",
+			"name": "storage.modifier.java"
 		},
 		"strings": {
 			"patterns": [
@@ -954,77 +1313,53 @@
 				}
 			]
 		},
-		"values": {
-			"patterns": [
-				{
-					"include": "#strings"
-				},
-				{
-					"include": "#object-types"
-				},
-				{
-					"include": "#constants-and-special-vars"
-				}
-			]
-		},
 		"variables": {
-			"applyEndPatternLast": 1,
+			"begin": "(?x:(?=\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  ([\\w<>\\[\\],][\\w<>\\[\\],?\\s]*)?\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": [
 				{
-					"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))",
+					"match": "([A-Za-z$_][\\w$]*)(?=\\s*(\\[\\])*\\s*(;|=|,))",
+					"captures": {
+						"1": {
+							"name": "variable.other.definition.java"
+						}
+					}
+				},
+				{
+					"include": "#all-types"
+				},
+				{
+					"begin": "=",
+					"beginCaptures": {
+						"0": {
+							"name": "keyword.operator.assignment.java"
+						}
+					},
 					"end": "(?=;)",
-					"name": "meta.definition.variable.java",
 					"patterns": [
-						{
-							"match": "\\s"
-						},
-						{
-							"captures": {
-								"1": {
-									"name": "constant.other.variable.java"
-								}
-							},
-							"match": "([A-Z_0-9]+)\\s+(?=\\=)"
-						},
-						{
-							"captures": {
-								"1": {
-									"name": "meta.definition.variable.name.java"
-								}
-							},
-							"match": "(\\w[^\\s,]*)\\s+(?=\\=)"
-						},
-						{
-							"begin": "=",
-							"beginCaptures": {
-								"0": {
-									"name": "keyword.operator.assignment.java"
-								}
-							},
-							"end": "(?=;)",
-							"patterns": [
-								{
-									"include": "#code"
-								}
-							]
-						},
-						{
-							"captures": {
-								"1": {
-									"name": "meta.definition.variable.name.java"
-								}
-							},
-							"match": "(\\w[^\\s=]*)(?=\\s*;)"
-						},
 						{
 							"include": "#code"
 						}
 					]
+				},
+				{
+					"include": "#code"
+				}
+			]
+		},
+		"member-variables": {
+			"begin": "(?=private|protected|public|native|synchronized|abstract|threadsafe|transient|static|final)",
+			"end": "(?=;)",
+			"patterns": [
+				{
+					"include": "#storage-modifiers"
+				},
+				{
+					"include": "#variables"
 				}
 			]
 		}
 	},
-	"scopeName": "source.java",
-	"uuid": "2B449DF6-6B1D-11D9-94EC-000D93589AF6",
-	"version": "https://github.com/textmate/java.tmbundle/commit/faffa518d0b22b68b4e5e6b4c939722522b97d40"
+	"version": "https://github.com/atom/language-java/commit/0e0ec7966059e3e363868311b3d855014bca95dd"
 }
\ No newline at end of file
diff --git a/extensions/java/syntaxes/javadoc.tmLanguage.json b/extensions/java/syntaxes/javadoc.tmLanguage.json
deleted file mode 100644
index a47e5c98d04..00000000000
--- a/extensions/java/syntaxes/javadoc.tmLanguage.json
+++ /dev/null
@@ -1,432 +0,0 @@
-{
-	"fileTypes": [],
-	"name": "JavaDoc",
-	"patterns": [
-		{
-			"begin": "(/\\*\\*)\\s*$",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.definition.comment.begin.javadoc"
-				}
-			},
-			"contentName": "text.html",
-			"end": "\\*/",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.comment.end.javadoc"
-				}
-			},
-			"name": "comment.block.documentation.javadoc",
-			"patterns": [
-				{
-					"include": "#inline"
-				},
-				{
-					"begin": "((\\@)param)",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.other.documentation.param.javadoc"
-						},
-						"2": {
-							"name": "punctuation.definition.keyword.javadoc"
-						}
-					},
-					"end": "(?=^\\s*\\*?\\s*@|\\*/)",
-					"name": "meta.documentation.tag.param.javadoc",
-					"patterns": [
-						{
-							"include": "#inline"
-						}
-					]
-				},
-				{
-					"begin": "((\\@)return)",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.other.documentation.return.javadoc"
-						},
-						"2": {
-							"name": "punctuation.definition.keyword.javadoc"
-						}
-					},
-					"end": "(?=^\\s*\\*?\\s*@|\\*/)",
-					"name": "meta.documentation.tag.return.javadoc",
-					"patterns": [
-						{
-							"include": "#inline"
-						}
-					]
-				},
-				{
-					"begin": "((\\@)throws)",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.other.documentation.throws.javadoc"
-						},
-						"2": {
-							"name": "punctuation.definition.keyword.javadoc"
-						}
-					},
-					"end": "(?=^\\s*\\*?\\s*@|\\*/)",
-					"name": "meta.documentation.tag.throws.javadoc",
-					"patterns": [
-						{
-							"include": "#inline"
-						}
-					]
-				},
-				{
-					"begin": "((\\@)exception)",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.other.documentation.exception.javadoc"
-						},
-						"2": {
-							"name": "punctuation.definition.keyword.javadoc"
-						}
-					},
-					"end": "(?=^\\s*\\*?\\s*@|\\*/)",
-					"name": "meta.documentation.tag.exception.javadoc",
-					"patterns": [
-						{
-							"include": "#inline"
-						}
-					]
-				},
-				{
-					"begin": "((\\@)author)",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.other.documentation.author.javadoc"
-						},
-						"2": {
-							"name": "punctuation.definition.keyword.javadoc"
-						}
-					},
-					"end": "(?=^\\s*\\*?\\s*@|\\*/)",
-					"name": "meta.documentation.tag.author.javadoc",
-					"patterns": [
-						{
-							"include": "#inline"
-						}
-					]
-				},
-				{
-					"begin": "((\\@)version)",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.other.documentation.version.javadoc"
-						},
-						"2": {
-							"name": "punctuation.definition.keyword.javadoc"
-						}
-					},
-					"end": "(?=^\\s*\\*?\\s*@|\\*/)",
-					"name": "meta.documentation.tag.version.javadoc",
-					"patterns": [
-						{
-							"include": "#inline"
-						}
-					]
-				},
-				{
-					"begin": "((\\@)see)",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.other.documentation.see.javadoc"
-						},
-						"2": {
-							"name": "punctuation.definition.keyword.javadoc"
-						}
-					},
-					"end": "(?=^\\s*\\*?\\s*@|\\*/)",
-					"name": "meta.documentation.tag.see.javadoc",
-					"patterns": [
-						{
-							"include": "#inline"
-						}
-					]
-				},
-				{
-					"begin": "((\\@)since)",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.other.documentation.since.javadoc"
-						},
-						"2": {
-							"name": "punctuation.definition.keyword.javadoc"
-						}
-					},
-					"end": "(?=^\\s*\\*?\\s*@|\\*/)",
-					"name": "meta.documentation.tag.since.javadoc",
-					"patterns": [
-						{
-							"include": "#inline"
-						}
-					]
-				},
-				{
-					"begin": "((\\@)serial)",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.other.documentation.serial.javadoc"
-						},
-						"2": {
-							"name": "punctuation.definition.keyword.javadoc"
-						}
-					},
-					"end": "(?=^\\s*\\*?\\s*@|\\*/)",
-					"name": "meta.documentation.tag.serial.javadoc",
-					"patterns": [
-						{
-							"include": "#inline"
-						}
-					]
-				},
-				{
-					"begin": "((\\@)serialField)",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.other.documentation.serialField.javadoc"
-						},
-						"2": {
-							"name": "punctuation.definition.keyword.javadoc"
-						}
-					},
-					"end": "(?=^\\s*\\*?\\s*@|\\*/)",
-					"name": "meta.documentation.tag.serialField.javadoc",
-					"patterns": [
-						{
-							"include": "#inline"
-						}
-					]
-				},
-				{
-					"begin": "((\\@)serialData)",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.other.documentation.serialData.javadoc"
-						},
-						"2": {
-							"name": "punctuation.definition.keyword.javadoc"
-						}
-					},
-					"end": "(?=^\\s*\\*?\\s*@|\\*/)",
-					"name": "meta.documentation.tag.serialData.javadoc",
-					"patterns": [
-						{
-							"include": "#inline"
-						}
-					]
-				},
-				{
-					"begin": "((\\@)deprecated)",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.other.documentation.deprecated.javadoc"
-						},
-						"2": {
-							"name": "punctuation.definition.keyword.javadoc"
-						}
-					},
-					"end": "(?=^\\s*\\*?\\s*@|\\*/)",
-					"name": "meta.documentation.tag.deprecated.javadoc",
-					"patterns": [
-						{
-							"include": "#inline"
-						}
-					]
-				},
-				{
-					"captures": {
-						"1": {
-							"name": "keyword.other.documentation.custom.javadoc"
-						},
-						"2": {
-							"name": "punctuation.definition.keyword.javadoc"
-						}
-					},
-					"match": "((\\@)\\S+)\\s"
-				}
-			]
-		}
-	],
-	"repository": {
-		"inline": {
-			"patterns": [
-				{
-					"include": "#inline-formatting"
-				},
-				{
-					"comment": "This prevents < characters in commented source from starting\n\t\t\t\t\t\t\t\ta tag that will not end. List of allowed tags taken from\n\t\t\t\t\t\t\t\tjava checkstyle.",
-					"match": "<(?!/?(a|abbr|acronym|address|area|b|bdo|big|blockquote|br|caption|cite|code|colgroup|dd|del|div|dfn|dl|dt|em|fieldset|font|h1toh6|hr|i|img|ins|kbd|li|ol|p|pre|q|samp|small|span|strong|sub|sup|table|tbody|td|tfoot|th|thread|tr|tt|u|ul)\\b[^>]*>)"
-				},
-				{
-					"include": "text.html.basic"
-				},
-				{
-					"match": "((https?|s?ftp|ftps|file|smb|afp|nfs|(x-)?man|gopher|txmt)://|mailto:)[-:@a-zA-Z0-9_.,~%+/?=&#;]+(?<![-.,?:#;])",
-					"name": "markup.underline.link"
-				}
-			]
-		},
-		"inline-formatting": {
-			"patterns": [
-				{
-					"begin": "(\\{)((\\@)code)",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.definition.tag.begin.javadoc"
-						},
-						"2": {
-							"name": "keyword.other.documentation.directive.code.javadoc"
-						},
-						"3": {
-							"name": "punctuation.definition.keyword.javadoc"
-						}
-					},
-					"contentName": "markup.raw.code.javadoc",
-					"end": "\\}",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.tag.end.javadoc"
-						}
-					},
-					"name": "meta.tag.template.code.javadoc",
-					"patterns": []
-				},
-				{
-					"begin": "(\\{)((\\@)literal)",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.definition.tag.begin.javadoc"
-						},
-						"2": {
-							"name": "keyword.other.documentation.directive.literal.javadoc"
-						},
-						"3": {
-							"name": "punctuation.definition.keyword.javadoc"
-						}
-					},
-					"contentName": "markup.raw.literal.javadoc",
-					"end": "\\}",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.tag.end.javadoc"
-						}
-					},
-					"name": "meta.tag.template.literal.javadoc",
-					"patterns": []
-				},
-				{
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.tag.begin.javadoc"
-						},
-						"2": {
-							"name": "keyword.other.documentation.directive.docRoot.javadoc"
-						},
-						"3": {
-							"name": "punctuation.definition.keyword.javadoc"
-						},
-						"4": {
-							"name": "punctuation.definition.tag.end.javadoc"
-						}
-					},
-					"match": "(\\{)((\\@)docRoot)(\\})",
-					"name": "meta.tag.template.docRoot.javadoc"
-				},
-				{
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.tag.begin.javadoc"
-						},
-						"2": {
-							"name": "keyword.other.documentation.directive.inheritDoc.javadoc"
-						},
-						"3": {
-							"name": "punctuation.definition.keyword.javadoc"
-						},
-						"4": {
-							"name": "punctuation.definition.tag.end.javadoc"
-						}
-					},
-					"match": "(\\{)((\\@)inheritDoc)(\\})",
-					"name": "meta.tag.template.inheritDoc.javadoc"
-				},
-				{
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.tag.begin.javadoc"
-						},
-						"2": {
-							"name": "keyword.other.documentation.directive.link.javadoc"
-						},
-						"3": {
-							"name": "punctuation.definition.keyword.javadoc"
-						},
-						"4": {
-							"name": "markup.underline.link.javadoc"
-						},
-						"5": {
-							"name": "string.other.link.title.javadoc"
-						},
-						"6": {
-							"name": "punctuation.definition.tag.end.javadoc"
-						}
-					},
-					"match": "(\\{)((\\@)link)(?:\\s+(\\S+?))?(?:\\s+(.+?))?\\s*(\\})",
-					"name": "meta.tag.template.link.javadoc"
-				},
-				{
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.tag.begin.javadoc"
-						},
-						"2": {
-							"name": "keyword.other.documentation.directive.linkplain.javadoc"
-						},
-						"3": {
-							"name": "punctuation.definition.keyword.javadoc"
-						},
-						"4": {
-							"name": "markup.underline.linkplain.javadoc"
-						},
-						"5": {
-							"name": "string.other.link.title.javadoc"
-						},
-						"6": {
-							"name": "punctuation.definition.tag.end.javadoc"
-						}
-					},
-					"match": "(\\{)((\\@)linkplain)(?:\\s+(\\S+?))?(?:\\s+(.+?))?\\s*(\\})",
-					"name": "meta.tag.template.linkplain.javadoc"
-				},
-				{
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.tag.begin.javadoc"
-						},
-						"2": {
-							"name": "keyword.other.documentation.directive.value.javadoc"
-						},
-						"3": {
-							"name": "punctuation.definition.keyword.javadoc"
-						},
-						"4": {
-							"name": "variable.other.javadoc"
-						},
-						"5": {
-							"name": "punctuation.definition.tag.end.javadoc"
-						}
-					},
-					"match": "(\\{)((\\@)value)\\s*(\\S+?)?\\s*(\\})",
-					"name": "meta.tag.template.value.javadoc"
-				}
-			]
-		}
-	},
-	"scopeName": "text.html.javadoc",
-	"uuid": "64BB98A4-59D4-474E-9091-C1E1D04BDD03",
-	"version": "https://github.com/textmate/javadoc.tmbundle/commit/5276d7a93f0cf53b7d425c39c6968b09ea9f2d40"
-}
\ No newline at end of file
diff --git a/extensions/java/test/colorize-results/basic_java.json b/extensions/java/test/colorize-results/basic_java.json
index b3353eabc69..0622a9209cc 100644
--- a/extensions/java/test/colorize-results/basic_java.json
+++ b/extensions/java/test/colorize-results/basic_java.json
@@ -221,13 +221,13 @@
 	},
 	{
 		"c": "*",
-		"t": "source.java meta.import.java storage.modifier.import.java",
+		"t": "source.java meta.import.java storage.modifier.import.java variable.language.wildcard.java",
 		"r": {
-			"dark_plus": "storage.modifier.import.java: #D4D4D4",
-			"light_plus": "storage.modifier.import.java: #000000",
-			"dark_vs": "storage.modifier.import.java: #D4D4D4",
-			"light_vs": "storage.modifier.import.java: #000000",
-			"hc_black": "storage.modifier.import.java: #D4D4D4"
+			"dark_plus": "variable.language.wildcard.java: #D4D4D4",
+			"light_plus": "variable.language.wildcard.java: #000000",
+			"dark_vs": "variable.language.wildcard.java: #D4D4D4",
+			"light_vs": "variable.language.wildcard.java: #000000",
+			"hc_black": "variable.language.wildcard.java: #D4D4D4"
 		}
 	},
 	{
@@ -353,7 +353,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.java meta.class.java meta.class.body.java punctuation.section.class.begin.java",
+		"t": "source.java meta.class.java punctuation.section.class.begin.bracket.curly.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -397,7 +397,7 @@
 	},
 	{
 		"c": "String",
-		"t": "source.java meta.class.java meta.class.body.java storage.type.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.definition.variable.java storage.type.java",
 		"r": {
 			"dark_plus": "storage.type.java: #4EC9B0",
 			"light_plus": "storage.type.java: #267F99",
@@ -407,8 +407,8 @@
 		}
 	},
 	{
-		"c": " aString",
-		"t": "source.java meta.class.java meta.class.body.java",
+		"c": " ",
+		"t": "source.java meta.class.java meta.class.body.java meta.definition.variable.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -417,6 +417,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": "aString",
+		"t": "source.java meta.class.java meta.class.body.java meta.definition.variable.java variable.other.definition.java",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
 	{
 		"c": ";",
 		"t": "source.java meta.class.java meta.class.body.java punctuation.terminator.java",
@@ -429,19 +440,19 @@
 		}
 	},
 	{
-		"c": "\t",
-		"t": "source.java meta.class.java meta.class.body.java",
+		"c": "\t/**",
+		"t": "source.java meta.class.java meta.class.body.java comment.block.javadoc.java punctuation.definition.comment.java",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "comment: #608B4E",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #608B4E",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668"
 		}
 	},
 	{
-		"c": "/**",
-		"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc punctuation.definition.comment.begin.javadoc",
+		"c": "\t * <p>Note:</p> Hello",
+		"t": "source.java meta.class.java meta.class.body.java comment.block.javadoc.java",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -452,7 +463,7 @@
 	},
 	{
 		"c": "\t * ",
-		"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html",
+		"t": "source.java meta.class.java meta.class.body.java comment.block.javadoc.java",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -462,107 +473,8 @@
 		}
 	},
 	{
-		"c": "<",
-		"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.tag.block.any.html punctuation.definition.tag.begin.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "p",
-		"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.tag.block.any.html entity.name.tag.block.any.html",
-		"r": {
-			"dark_plus": "entity.name.tag: #569CD6",
-			"light_plus": "entity.name.tag: #800000",
-			"dark_vs": "entity.name.tag: #569CD6",
-			"light_vs": "entity.name.tag: #800000",
-			"hc_black": "entity.name.tag: #569CD6"
-		}
-	},
-	{
-		"c": ">",
-		"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.tag.block.any.html punctuation.definition.tag.end.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "Note:",
-		"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html",
-		"r": {
-			"dark_plus": "comment: #608B4E",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668"
-		}
-	},
-	{
-		"c": "</",
-		"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.tag.block.any.html punctuation.definition.tag.begin.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": "p",
-		"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.tag.block.any.html entity.name.tag.block.any.html",
-		"r": {
-			"dark_plus": "entity.name.tag: #569CD6",
-			"light_plus": "entity.name.tag: #800000",
-			"dark_vs": "entity.name.tag: #569CD6",
-			"light_vs": "entity.name.tag: #800000",
-			"hc_black": "entity.name.tag: #569CD6"
-		}
-	},
-	{
-		"c": ">",
-		"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.tag.block.any.html punctuation.definition.tag.end.html",
-		"r": {
-			"dark_plus": "punctuation.definition.tag: #808080",
-			"light_plus": "punctuation.definition.tag: #800000",
-			"dark_vs": "punctuation.definition.tag: #808080",
-			"light_vs": "punctuation.definition.tag: #800000",
-			"hc_black": "punctuation.definition.tag: #808080"
-		}
-	},
-	{
-		"c": " Hello",
-		"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html",
-		"r": {
-			"dark_plus": "comment: #608B4E",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668"
-		}
-	},
-	{
-		"c": "\t * ",
-		"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html",
-		"r": {
-			"dark_plus": "comment: #608B4E",
-			"light_plus": "comment: #008000",
-			"dark_vs": "comment: #608B4E",
-			"light_vs": "comment: #008000",
-			"hc_black": "comment: #7CA668"
-		}
-	},
-	{
-		"c": "@",
-		"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.documentation.tag.param.javadoc keyword.other.documentation.param.javadoc punctuation.definition.keyword.javadoc",
+		"c": "@param",
+		"t": "source.java meta.class.java meta.class.body.java comment.block.javadoc.java keyword.other.documentation.javadoc.java",
 		"r": {
 			"dark_plus": "keyword: #569CD6",
 			"light_plus": "keyword: #0000FF",
@@ -572,19 +484,8 @@
 		}
 	},
 	{
-		"c": "param",
-		"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.documentation.tag.param.javadoc keyword.other.documentation.param.javadoc",
-		"r": {
-			"dark_plus": "keyword: #569CD6",
-			"light_plus": "keyword: #0000FF",
-			"dark_vs": "keyword: #569CD6",
-			"light_vs": "keyword: #0000FF",
-			"hc_black": "keyword: #569CD6"
-		}
-	},
-	{
-		"c": " args",
-		"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.documentation.tag.param.javadoc",
+		"c": " ",
+		"t": "source.java meta.class.java meta.class.body.java comment.block.javadoc.java",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -593,9 +494,20 @@
 			"hc_black": "comment: #7CA668"
 		}
 	},
+	{
+		"c": "args",
+		"t": "source.java meta.class.java meta.class.body.java comment.block.javadoc.java variable.parameter.java",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "comment: #608B4E",
+			"light_vs": "comment: #008000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
 	{
 		"c": "\t ",
-		"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc text.html meta.documentation.tag.param.javadoc",
+		"t": "source.java meta.class.java meta.class.body.java comment.block.javadoc.java",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -606,7 +518,7 @@
 	},
 	{
 		"c": "*/",
-		"t": "source.java meta.class.java meta.class.body.java comment.block.documentation.javadoc punctuation.definition.comment.end.javadoc",
+		"t": "source.java meta.class.java meta.class.body.java comment.block.javadoc.java punctuation.definition.comment.java",
 		"r": {
 			"dark_plus": "comment: #608B4E",
 			"light_plus": "comment: #008000",
@@ -650,18 +562,18 @@
 	},
 	{
 		"c": "void",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.return-type.java storage.type.primitive.array.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.return-type.java storage.type.primitive.java",
 		"r": {
-			"dark_plus": "storage.type.primitive.array.java: #4EC9B0",
-			"light_plus": "storage.type.primitive.array.java: #267F99",
+			"dark_plus": "storage.type.primitive.java: #4EC9B0",
+			"light_plus": "storage.type.primitive.java: #267F99",
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type.primitive.array.java: #4EC9B0"
+			"hc_black": "storage.type.primitive.java: #4EC9B0"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.return-type.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -683,7 +595,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.identifier.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.identifier.java punctuation.definition.parameters.begin.bracket.round.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -694,13 +606,13 @@
 	},
 	{
 		"c": "int",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.identifier.java storage.type.primitive.array.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.identifier.java storage.type.primitive.java",
 		"r": {
-			"dark_plus": "storage.type.primitive.array.java: #4EC9B0",
-			"light_plus": "storage.type.primitive.array.java: #267F99",
+			"dark_plus": "storage.type.primitive.java: #4EC9B0",
+			"light_plus": "storage.type.primitive.java: #267F99",
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type.primitive.array.java: #4EC9B0"
+			"hc_black": "storage.type.primitive.java: #4EC9B0"
 		}
 	},
 	{
@@ -727,7 +639,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.identifier.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.identifier.java punctuation.definition.parameters.end.bracket.round.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -749,7 +661,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java punctuation.section.method.begin.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java punctuation.section.method.begin.bracket.curly.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -771,18 +683,40 @@
 	},
 	{
 		"c": "double",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java storage.type.primitive.array.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java storage.type.primitive.java",
 		"r": {
-			"dark_plus": "storage.type.primitive.array.java: #4EC9B0",
-			"light_plus": "storage.type.primitive.array.java: #267F99",
+			"dark_plus": "storage.type.primitive.java: #4EC9B0",
+			"light_plus": "storage.type.primitive.java: #267F99",
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type.primitive.array.java: #4EC9B0"
+			"hc_black": "storage.type.primitive.java: #4EC9B0"
 		}
 	},
 	{
-		"c": " b ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
+		"c": " ",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "b",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java variable.other.definition.java",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -793,7 +727,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.operator.assignment.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java keyword.operator.assignment.java",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -804,7 +738,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -815,7 +749,7 @@
 	},
 	{
 		"c": "0.0",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.float.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java constant.numeric.decimal.java",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -848,18 +782,40 @@
 	},
 	{
 		"c": "double",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java storage.type.primitive.array.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java storage.type.primitive.java",
 		"r": {
-			"dark_plus": "storage.type.primitive.array.java: #4EC9B0",
-			"light_plus": "storage.type.primitive.array.java: #267F99",
+			"dark_plus": "storage.type.primitive.java: #4EC9B0",
+			"light_plus": "storage.type.primitive.java: #267F99",
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type.primitive.array.java: #4EC9B0"
+			"hc_black": "storage.type.primitive.java: #4EC9B0"
 		}
 	},
 	{
-		"c": " c ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
+		"c": " ",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "c",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java variable.other.definition.java",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -870,7 +826,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.operator.assignment.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java keyword.operator.assignment.java",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -881,7 +837,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -892,7 +848,7 @@
 	},
 	{
 		"c": "10e3",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.float.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java constant.numeric.decimal.java",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -925,18 +881,40 @@
 	},
 	{
 		"c": "long",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java storage.type.primitive.array.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java storage.type.primitive.java",
 		"r": {
-			"dark_plus": "storage.type.primitive.array.java: #4EC9B0",
-			"light_plus": "storage.type.primitive.array.java: #267F99",
+			"dark_plus": "storage.type.primitive.java: #4EC9B0",
+			"light_plus": "storage.type.primitive.java: #267F99",
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type.primitive.array.java: #4EC9B0"
+			"hc_black": "storage.type.primitive.java: #4EC9B0"
 		}
 	},
 	{
-		"c": " l ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
+		"c": " ",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "l",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java variable.other.definition.java",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -947,7 +925,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.operator.assignment.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java keyword.operator.assignment.java",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -958,7 +936,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -969,7 +947,7 @@
 	},
 	{
 		"c": "134l",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.integer.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java constant.numeric.decimal.java",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1002,7 +980,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java punctuation.section.method.end.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java punctuation.section.method.end.bracket.curly.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1090,7 +1068,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.java meta.class.java meta.class.body.java meta.declaration.annotation.java punctuation.definition.annotation-arguments.begin.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.declaration.annotation.java punctuation.definition.annotation-arguments.begin.bracket.round.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1178,7 +1156,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.java meta.class.java meta.class.body.java meta.declaration.annotation.java punctuation.definition.annotation-arguments.end.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.declaration.annotation.java punctuation.definition.annotation-arguments.end.bracket.round.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1222,18 +1200,18 @@
 	},
 	{
 		"c": "long",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.return-type.java storage.type.primitive.array.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.return-type.java storage.type.primitive.java",
 		"r": {
-			"dark_plus": "storage.type.primitive.array.java: #4EC9B0",
-			"light_plus": "storage.type.primitive.array.java: #267F99",
+			"dark_plus": "storage.type.primitive.java: #4EC9B0",
+			"light_plus": "storage.type.primitive.java: #267F99",
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type.primitive.array.java: #4EC9B0"
+			"hc_black": "storage.type.primitive.java: #4EC9B0"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.return-type.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1255,7 +1233,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.identifier.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.identifier.java punctuation.definition.parameters.begin.bracket.round.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1266,13 +1244,13 @@
 	},
 	{
 		"c": "long",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.identifier.java storage.type.primitive.array.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.identifier.java storage.type.primitive.java",
 		"r": {
-			"dark_plus": "storage.type.primitive.array.java: #4EC9B0",
-			"light_plus": "storage.type.primitive.array.java: #267F99",
+			"dark_plus": "storage.type.primitive.java: #4EC9B0",
+			"light_plus": "storage.type.primitive.java: #267F99",
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type.primitive.array.java: #4EC9B0"
+			"hc_black": "storage.type.primitive.java: #4EC9B0"
 		}
 	},
 	{
@@ -1299,7 +1277,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.identifier.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.identifier.java punctuation.definition.parameters.end.bracket.round.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1310,7 +1288,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java punctuation.section.method.begin.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java punctuation.section.method.begin.bracket.curly.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1341,50 +1319,6 @@
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
-	{
-		"c": " (",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "int",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java storage.type.primitive.array.java",
-		"r": {
-			"dark_plus": "storage.type.primitive.array.java: #4EC9B0",
-			"light_plus": "storage.type.primitive.array.java: #267F99",
-			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type.primitive.array.java: #4EC9B0"
-		}
-	},
-	{
-		"c": " i ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "=",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.operator.assignment.java",
-		"r": {
-			"dark_plus": "keyword.operator: #D4D4D4",
-			"light_plus": "keyword.operator: #000000",
-			"dark_vs": "keyword.operator: #D4D4D4",
-			"light_vs": "keyword.operator: #000000",
-			"hc_black": "keyword.operator: #D4D4D4"
-		}
-	},
 	{
 		"c": " ",
 		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
@@ -1396,9 +1330,86 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": "(",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java punctuation.bracket.round.java",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "int",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java storage.type.primitive.java",
+		"r": {
+			"dark_plus": "storage.type.primitive.java: #4EC9B0",
+			"light_plus": "storage.type.primitive.java: #267F99",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type.primitive.java: #4EC9B0"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "i",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java variable.other.definition.java",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java keyword.operator.assignment.java",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "0",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.integer.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java constant.numeric.decimal.java",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1453,7 +1464,7 @@
 	},
 	{
 		"c": "9",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.integer.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.decimal.java",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1496,7 +1507,18 @@
 		}
 	},
 	{
-		"c": ") ",
+		"c": ")",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java punctuation.bracket.round.java",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -1508,7 +1530,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java punctuation.section.block.begin.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java punctuation.section.block.begin.bracket.curly.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1530,51 +1552,40 @@
 	},
 	{
 		"c": "System",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java storage.type.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java variable.other.object.java",
 		"r": {
-			"dark_plus": "storage.type.java: #4EC9B0",
-			"light_plus": "storage.type.java: #267F99",
-			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type.java: #4EC9B0"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
 		"c": ".",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.operator.dereference.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java punctuation.separator.period.java",
 		"r": {
-			"dark_plus": "keyword.operator: #D4D4D4",
-			"light_plus": "keyword.operator: #000000",
-			"dark_vs": "keyword.operator: #D4D4D4",
-			"light_vs": "keyword.operator: #000000",
-			"hc_black": "keyword.operator: #D4D4D4"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
 		"c": "out",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java variable.other.object.property.java",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
 		"c": ".",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.operator.dereference.java",
-		"r": {
-			"dark_plus": "keyword.operator: #D4D4D4",
-			"light_plus": "keyword.operator: #000000",
-			"dark_vs": "keyword.operator: #D4D4D4",
-			"light_vs": "keyword.operator: #000000",
-			"hc_black": "keyword.operator: #D4D4D4"
-		}
-	},
-	{
-		"c": "println",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.method-call.java meta.method.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.method-call.java punctuation.separator.period.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1583,9 +1594,20 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": "println",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.method-call.java entity.name.function.java",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA"
+		}
+	},
 	{
 		"c": "(",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.method-call.java punctuation.definition.method-parameters.begin.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.method-call.java punctuation.definition.parameters.begin.bracket.round.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1662,7 +1684,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.method-call.java punctuation.definition.method-parameters.end.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.method-call.java punctuation.definition.parameters.end.bracket.round.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1695,7 +1717,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java punctuation.section.block.end.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java punctuation.section.block.end.bracket.curly.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1739,7 +1761,7 @@
 	},
 	{
 		"c": "10",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.integer.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.decimal.java",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1772,7 +1794,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java punctuation.section.method.end.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java punctuation.section.method.end.bracket.curly.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1871,18 +1893,18 @@
 	},
 	{
 		"c": "void",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.return-type.java storage.type.primitive.array.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.return-type.java storage.type.primitive.java",
 		"r": {
-			"dark_plus": "storage.type.primitive.array.java: #4EC9B0",
-			"light_plus": "storage.type.primitive.array.java: #267F99",
+			"dark_plus": "storage.type.primitive.java: #4EC9B0",
+			"light_plus": "storage.type.primitive.java: #267F99",
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type.primitive.array.java: #4EC9B0"
+			"hc_black": "storage.type.primitive.java: #4EC9B0"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.return-type.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1903,8 +1925,19 @@
 		}
 	},
 	{
-		"c": "()",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.identifier.java",
+		"c": "(",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.identifier.java punctuation.definition.parameters.begin.bracket.round.java",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.identifier.java punctuation.definition.parameters.end.bracket.round.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1926,7 +1959,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java punctuation.section.method.begin.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java punctuation.section.method.begin.bracket.curly.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1948,18 +1981,40 @@
 	},
 	{
 		"c": "int",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java storage.type.primitive.array.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java storage.type.primitive.java",
 		"r": {
-			"dark_plus": "storage.type.primitive.array.java: #4EC9B0",
-			"light_plus": "storage.type.primitive.array.java: #267F99",
+			"dark_plus": "storage.type.primitive.java: #4EC9B0",
+			"light_plus": "storage.type.primitive.java: #267F99",
 			"dark_vs": "storage.type: #569CD6",
 			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type.primitive.array.java: #4EC9B0"
+			"hc_black": "storage.type.primitive.java: #4EC9B0"
 		}
 	},
 	{
-		"c": " hex ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
+		"c": " ",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "hex",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java variable.other.definition.java",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1970,7 +2025,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.operator.assignment.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java keyword.operator.assignment.java",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1981,7 +2036,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1992,7 +2047,7 @@
 	},
 	{
 		"c": "0x5",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.hex.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java constant.numeric.hex.java",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -2024,19 +2079,8 @@
 		}
 	},
 	{
-		"c": "Vector<",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java storage.type.generic.java",
-		"r": {
-			"dark_plus": "storage.type.generic.java: #4EC9B0",
-			"light_plus": "storage.type.generic.java: #267F99",
-			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type.generic.java: #4EC9B0"
-		}
-	},
-	{
-		"c": "Number",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java storage.type.generic.java storage.type.java",
+		"c": "Vector",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java storage.type.java",
 		"r": {
 			"dark_plus": "storage.type.java: #4EC9B0",
 			"light_plus": "storage.type.java: #267F99",
@@ -2046,8 +2090,19 @@
 		}
 	},
 	{
-		"c": ">",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java storage.type.generic.java",
+		"c": "<",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java punctuation.bracket.angle.java",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "Number",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java storage.type.generic.java",
 		"r": {
 			"dark_plus": "storage.type.generic.java: #4EC9B0",
 			"light_plus": "storage.type.generic.java: #267F99",
@@ -2057,8 +2112,41 @@
 		}
 	},
 	{
-		"c": " v ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
+		"c": ">",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java punctuation.bracket.angle.java",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "v",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java variable.other.definition.java",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2069,7 +2157,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.operator.assignment.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java keyword.operator.assignment.java",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2080,7 +2168,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2091,7 +2179,7 @@
 	},
 	{
 		"c": "new",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.control.new.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java keyword.control.new.java",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -2102,7 +2190,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2113,18 +2201,29 @@
 	},
 	{
 		"c": "Vector",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java storage.type.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java meta.function-call.java entity.name.function.java",
 		"r": {
-			"dark_plus": "storage.type.java: #4EC9B0",
-			"light_plus": "storage.type.java: #267F99",
-			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type.java: #4EC9B0"
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA"
 		}
 	},
 	{
-		"c": "()",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java",
+		"c": "(",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java meta.function-call.java punctuation.definition.parameters.begin.bracket.round.java",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java meta.definition.variable.java meta.function-call.java punctuation.definition.parameters.end.bracket.round.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2157,7 +2256,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.java meta.class.java meta.class.body.java meta.method.java punctuation.section.method.end.java",
+		"t": "source.java meta.class.java meta.class.body.java meta.method.java punctuation.section.method.end.bracket.curly.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2168,7 +2267,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.java meta.class.java punctuation.section.class.end.java",
+		"t": "source.java meta.class.java punctuation.section.class.end.bracket.curly.java",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/theme-defaults/themes/dark_vs.json b/extensions/theme-defaults/themes/dark_vs.json
index 40bcc308f28..827f59892d8 100644
--- a/extensions/theme-defaults/themes/dark_vs.json
+++ b/extensions/theme-defaults/themes/dark_vs.json
@@ -325,6 +325,7 @@
 			"name": "coloring of the Java import and package identifiers",
 			"scope": [
 				"storage.modifier.import.java",
+				"variable.language.wildcard.java",
 				"storage.modifier.package.java"
 			],
 			"settings": {
diff --git a/extensions/theme-defaults/themes/hc_black_defaults.json b/extensions/theme-defaults/themes/hc_black_defaults.json
index b98e3e17b26..6537cac26f2 100644
--- a/extensions/theme-defaults/themes/hc_black_defaults.json
+++ b/extensions/theme-defaults/themes/hc_black_defaults.json
@@ -300,7 +300,11 @@
 		},
 		{
 			"name": "coloring of the Java import and package identifiers",
-			"scope": ["storage.modifier.import.java", "storage.modifier.package.java"],
+			"scope": [
+				"storage.modifier.import.java",
+				"variable.language.wildcard.java",
+				"storage.modifier.package.java"
+			],
 			"settings": {
 				"foreground": "#d4d4d4"
 			}
diff --git a/extensions/theme-defaults/themes/light_vs.json b/extensions/theme-defaults/themes/light_vs.json
index 8d5fabb13a3..1c294607f60 100644
--- a/extensions/theme-defaults/themes/light_vs.json
+++ b/extensions/theme-defaults/themes/light_vs.json
@@ -341,6 +341,7 @@
 			"name": "coloring of the Java import and package identifiers",
 			"scope": [
 				"storage.modifier.import.java",
+				"variable.language.wildcard.java",
 				"storage.modifier.package.java"
 			],
 			"settings": {