From 864a170aa49964d3700cc0233b7e4e07609d0250 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Fri, 9 Feb 2018 12:15:49 +0100
Subject: [PATCH] [java] update grammar

---
 extensions/java/syntaxes/java.tmLanguage.json | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/extensions/java/syntaxes/java.tmLanguage.json b/extensions/java/syntaxes/java.tmLanguage.json
index 07553c758aa..5be7bc9f4ee 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/cf96ae95ea2e2f4cfd5e6e685e6d7db039859cc6",
+	"version": "https://github.com/atom/language-java/commit/5c2863da1425d61914d2e04ef31b86f8c5883c5f",
 	"scopeName": "source.java",
 	"name": "Java",
 	"fileTypes": [
@@ -36,9 +36,13 @@
 					"name": "invalid.illegal.character_not_allowed_here.java"
 				},
 				{
-					"match": "(?<!_)_(?=\\s*(\\.|;))|[A-Z]+|\\b\\d+|-+",
+					"match": "(?<!_)_(?=\\s*(\\.|;))|\\b\\d+|-+",
 					"name": "invalid.illegal.character_not_allowed_here.java"
 				},
+				{
+					"match": "[A-Z]+",
+					"name": "invalid.deprecated.package_name_not_lowercase.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"
@@ -533,7 +537,7 @@
 		"comments-javadoc": {
 			"patterns": [
 				{
-					"begin": "^\\s*/\\*\\*",
+					"begin": "^\\s*/\\*\\*(?!/)",
 					"beginCaptures": {
 						"0": {
 							"name": "punctuation.definition.comment.java"
@@ -675,6 +679,9 @@
 							},
 							"contentName": "meta.catch.parameters.java",
 							"patterns": [
+								{
+									"include": "#comments"
+								},
 								{
 									"include": "#parameters"
 								}
@@ -773,6 +780,9 @@
 						}
 					}
 				},
+				{
+					"include": "#primitive-arrays"
+				},
 				{
 					"match": "[a-zA-Z$_][a-zA-Z0-9$_]*",
 					"name": "storage.type.generic.java"
@@ -1389,6 +1399,12 @@
 				},
 				{
 					"include": "#variables"
+				},
+				{
+					"include": "#primitive-arrays"
+				},
+				{
+					"include": "#object-types"
 				}
 			]
 		}