diff --git a/extensions/java/syntaxes/java.tmLanguage.json b/extensions/java/syntaxes/java.tmLanguage.json
index a63b731e54d..28495a497cc 100644
--- a/extensions/java/syntaxes/java.tmLanguage.json
+++ b/extensions/java/syntaxes/java.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/atom/language-java/commit/0e0ec7966059e3e363868311b3d855014bca95dd",
+	"version": "https://github.com/atom/language-java/commit/4eb3d906f572ef1999b7ebf0708c841d36b32f0b",
 	"scopeName": "source.java",
 	"name": "Java",
 	"fileTypes": [
@@ -167,7 +167,7 @@
 					"name": "keyword.control.new.java"
 				}
 			},
-			"end": "(?=;|\\)|,|:)",
+			"end": "(?=;|\\)|,|:|}|\\+)",
 			"patterns": [
 				{
 					"include": "#function-call"
@@ -1121,6 +1121,9 @@
 				{
 					"include": "#all-types"
 				},
+				{
+					"include": "#strings"
+				},
 				{
 					"match": "\\w+",
 					"name": "variable.parameter.java"
@@ -1320,7 +1323,7 @@
 			]
 		},
 		"variables": {
-			"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))",
+			"begin": "(?x)\n(?=\n  (\n    (void|boolean|byte|char|short|int|float|long|double)\n    |\n    (?>(\\w+\\.)*[A-Z]+\\w*) # e.g. `javax.ws.rs.Response`, or `String`\n  )\n  (\n    <[\\w<>,?\\s]*> # HashMap<Integer, String>\n    |\n    (\\[\\])* # int[][]\n  )?\n  \\s+\n  [A-Za-z_$][\\w$]* # At least one identifier after space\n  ([\\w\\[\\],$][\\w\\[\\],\\s]*)? # possibly primitive array or additional identifiers\n  \\s*(=|;)\n)",
 			"end": "(?=;)",
 			"name": "meta.definition.variable.java",
 			"patterns": [