Tone down

Author: georgewfraser

lib/java.tmLanguage.json

@@ -192,9 +192,6 @@
 				{
 					"include": "#comments"
 				},
-				{
-					"include": "#function-call"
-				},
 				{
 					"include": "#all-types"
 				},
@@ -441,12 +438,6 @@
 				{
 					"include": "#storage-modifiers"
 				},
-				{
-					"include": "#method-call"
-				},
-				{
-					"include": "#function-call"
-				},
 				{
 					"include": "#properties"
 				},
@@ -459,10 +450,6 @@
 				{
 					"include": "#all-types"
 				},
-				{
-					"match": "[\\w$]+",
-					"name": "variable.other.reference.java"
-				},
 				{
 					"match": ",",
 					"name": "punctuation.separator.delimiter.java"
@@ -864,29 +851,6 @@
 				}
 			]
 		},
-		"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": "#code"
-				}
-			]
-		},
 		"keywords": {
 			"patterns": [
 				{
@@ -944,10 +908,6 @@
 				{
 					"match": "\\b(const|goto)\\b",
 					"name": "keyword.reserved.java"
-                },
-                {
-                    "match": "\\bvar\\b",
-                    "name": "storage.type.java"
                 }
 			]
 		},
@@ -959,32 +919,6 @@
 				}
 			]
 		},
-		"method-call": {
-			"begin": "(\\.)\\s*([A-Za-z_$][\\w$]*)\\s*(\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.separator.period.java"
-				},
-				"2": {
-					"name": "entity.name.function.java"
-				},
-				"3": {
-					"name": "punctuation.definition.parameters.begin.bracket.round.java"
-				}
-			},
-			"end": "\\)",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.parameters.end.bracket.round.java"
-				}
-			},
-			"name": "meta.method-call.java",
-			"patterns": [
-				{
-					"include": "#code"
-				}
-			]
-		},
 		"methods": {
 			"begin": "(?!new)(?=[\\w<].*\\s+)(?=([^=/]|/(?!/))+\\()",
 			"end": "(})|(?=;)",
@@ -1002,7 +936,7 @@
 					"begin": "(\\w+)\\s*(\\()",
 					"beginCaptures": {
 						"1": {
-							"name": "entity.name.function.java"
+							"name": "variable.other.method.declaration.java"
 						},
 						"2": {
 							"name": "punctuation.definition.parameters.begin.bracket.round.java"
@@ -1311,7 +1245,7 @@
 			]
 		},
 		"primitive-types": {
-			"match": "\\b(void|boolean|byte|char|short|int|float|long|double)\\b",
+			"match": "\\b(void|boolean|byte|char|short|int|float|long|double|var)\\b",
 			"name": "storage.type.primitive.java"
 		},
 		"properties": {
@@ -1321,9 +1255,6 @@
 					"captures": {
 						"1": {
 							"name": "punctuation.separator.period.java"
-						},
-						"2": {
-							"name": "variable.other.object.property.java"
 						}
 					}
 				},
@@ -1332,9 +1263,6 @@
 					"captures": {
 						"1": {
 							"name": "punctuation.separator.period.java"
-						},
-						"2": {
-							"name": "variable.other.property.java"
 						}
 					}
 				},
@@ -1422,7 +1350,7 @@
 			]
 		},
 		"variables": {
-			"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\\[\\]]*> # e.g. `HashMap<Integer, String>`, or `List<java.lang.String>`\n  )?\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)",
+			"begin": "(?x)\n(?=\n  (\n    (void|boolean|byte|char|short|int|float|long|double|var)\n    |\n    (?>(\\w+\\.)*[A-Z]+\\w*) # e.g. `javax.ws.rs.Response`, or `String`\n  )\n  (\n    <[\\w<>,\\.?\\s\\[\\]]*> # e.g. `HashMap<Integer, String>`, or `List<java.lang.String>`\n  )?\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": [