[java] update grammar

aeschli · aeschli · commit 864a170aa499 · 2018-02-09T12:45:27.000+01:00
diff --git 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"
 				}
 			]
 		}

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"If you want to provide a fix or improvement, please create a pull request against the original repository.",`
`5`	`5`	`"Once accepted there, we are happy to receive an update request."`
`6`	`6`	`],`
`7`		`- "version": "https://github.com/atom/language-java/commit/cf96ae95ea2e2f4cfd5e6e685e6d7db039859cc6",`
	`7`	`+ "version": "https://github.com/atom/language-java/commit/5c2863da1425d61914d2e04ef31b86f8c5883c5f",`
`8`	`8`	`"scopeName": "source.java",`
`9`	`9`	`"name": "Java",`
`10`	`10`	`"fileTypes": [`
`@@ -36,9 +36,13 @@`
`36`	`36`	`"name": "invalid.illegal.character_not_allowed_here.java"`
`37`	`37`	`},`
`38`	`38`	`{`
`39`		`- "match": "(?<!_)_(?=\\s*(\\.\|;))\|[A-Z]+\|\\b\\d+\|-+",`
	`39`	`+ "match": "(?<!_)_(?=\\s*(\\.\|;))\|\\b\\d+\|-+",`
`40`	`40`	`"name": "invalid.illegal.character_not_allowed_here.java"`
`41`	`41`	`},`
	`42`	`+ {`
	`43`	`+ "match": "[A-Z]+",`
	`44`	`+ "name": "invalid.deprecated.package_name_not_lowercase.java"`
	`45`	`+ },`
`42`	`46`	`{`
`43`	`47`	`"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",`
`44`	`48`	`"name": "invalid.illegal.character_not_allowed_here.java"`
`@@ -533,7 +537,7 @@`
`533`	`537`	`"comments-javadoc": {`
`534`	`538`	`"patterns": [`
`535`	`539`	`{`
`536`		`- "begin": "^\\s/\\\\*",`
	`540`	`+ "begin": "^\\s/\\\\*(?!/)",`
`537`	`541`	`"beginCaptures": {`
`538`	`542`	`"0": {`
`539`	`543`	`"name": "punctuation.definition.comment.java"`
`@@ -675,6 +679,9 @@`
`675`	`679`	`},`
`676`	`680`	`"contentName": "meta.catch.parameters.java",`
`677`	`681`	`"patterns": [`
	`682`	`+ {`
	`683`	`+ "include": "#comments"`
	`684`	`+ },`
`678`	`685`	`{`
`679`	`686`	`"include": "#parameters"`
`680`	`687`	`}`
`@@ -773,6 +780,9 @@`
`773`	`780`	`}`
`774`	`781`	`}`
`775`	`782`	`},`
	`783`	`+ {`
	`784`	`+ "include": "#primitive-arrays"`
	`785`	`+ },`
`776`	`786`	`{`
`777`	`787`	`"match": "[a-zA-Z$_][a-zA-Z0-9$_]*",`
`778`	`788`	`"name": "storage.type.generic.java"`
`@@ -1389,6 +1399,12 @@`
`1389`	`1399`	`},`
`1390`	`1400`	`{`
`1391`	`1401`	`"include": "#variables"`
	`1402`	`+ },`
	`1403`	`+ {`
	`1404`	`+ "include": "#primitive-arrays"`
	`1405`	`+ },`
	`1406`	`+ {`
	`1407`	`+ "include": "#object-types"`
`1392`	`1408`	`}`
`1393`	`1409`	`]`
`1394`	`1410`	`}`