Prune textmate grammar

Signed-off-by: Ben Sherman <bentshermann@gmail.com>

Author: bentsherman

syntaxes/groovy.tmLanguage.json

@@ -85,16 +85,6 @@
 				}
 			]
 		},
-		"comment-block": {
-			"begin": "/\\*",
-			"captures": {
-				"0": {
-					"name": "punctuation.definition.comment.groovy"
-				}
-			},
-			"end": "\\*/",
-			"name": "comment.block.groovy"
-		},
 		"comments": {
 			"patterns": [
 				{
@@ -110,7 +100,14 @@
 					"include": "text.html.javadoc"
 				},
 				{
-					"include": "#comment-block"
+					"begin": "/\\*",
+					"captures": {
+						"0": {
+							"name": "punctuation.definition.comment.groovy"
+						}
+					},
+					"end": "\\*/",
+					"name": "comment.block.groovy"
 				},
 				{
 					"captures": {
@@ -142,7 +139,7 @@
 					"name": "keyword.control.new.groovy"
 				}
 			},
-			"end": "(?<=\\)|\\])(?!\\s*{)|(?<=})|(?=[;])|$",
+			"end": "(?<=\\))|$",
 			"patterns": [
 				{
 					"begin": "(?=\\w.*\\(?)",
@@ -198,9 +195,6 @@
 				{
 					"include": "#comments"
 				},
-				{
-					"include": "#support-functions"
-				},
 				{
 					"include": "#keyword-language"
 				},
@@ -279,10 +273,6 @@
 					"match": "\\?\\:",
 					"name": "keyword.operator.elvis.groovy"
 				},
-				{
-					"match": "\\*\\:",
-					"name": "keyword.operator.spreadmap.groovy"
-				},
 				{
 					"match": "\\.\\.",
 					"name": "keyword.operator.range.groovy"
@@ -475,9 +465,6 @@
 		},
 		"parameters": {
 			"patterns": [
-				{
-					"include": "#storage-modifiers"
-				},
 				{
 					"include": "#types"
 				},
@@ -504,52 +491,6 @@
 				}
 			]
 		},
-		"regexp": {
-			"patterns": [
-				{
-					"begin": "/(?=[^/]+/([^>]|$))",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.regexp.begin.groovy"
-						}
-					},
-					"end": "/",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.regexp.end.groovy"
-						}
-					},
-					"name": "string.regexp.groovy",
-					"patterns": [
-						{
-							"match": "\\\\.",
-							"name": "constant.character.escape.groovy"
-						}
-					]
-				},
-				{
-					"begin": "~\"",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.regexp.begin.groovy"
-						}
-					},
-					"end": "\"",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.regexp.end.groovy"
-						}
-					},
-					"name": "string.regexp.compiled.groovy",
-					"patterns": [
-						{
-							"match": "\\\\.",
-							"name": "constant.character.escape.groovy"
-						}
-					]
-				}
-			]
-		},
 		"string-quoted-double": {
 			"begin": "\"",
 			"beginCaptures": {
@@ -677,6 +618,52 @@
 				}
 			]
 		},
+		"string-slashy": {
+			"patterns": [
+				{
+					"begin": "/(?=[^/]+/([^>]|$))",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.regexp.begin.groovy"
+						}
+					},
+					"end": "/",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.regexp.end.groovy"
+						}
+					},
+					"name": "string.regexp.groovy",
+					"patterns": [
+						{
+							"match": "\\\\.",
+							"name": "constant.character.escape.groovy"
+						}
+					]
+				},
+				{
+					"begin": "~\"",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.regexp.begin.groovy"
+						}
+					},
+					"end": "\"",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.regexp.end.groovy"
+						}
+					},
+					"name": "string.regexp.compiled.groovy",
+					"patterns": [
+						{
+							"match": "\\\\.",
+							"name": "constant.character.escape.groovy"
+						}
+					]
+				}
+			]
+		},
 		"strings": {
 			"patterns": [
 				{
@@ -692,7 +679,7 @@
 					"include": "#string-quoted-single"
 				},
 				{
-					"include": "#regexp"
+					"include": "#string-slashy"
 				}
 			]
 		},
@@ -720,14 +707,6 @@
 				}
 			]
 		},
-		"support-functions": {
-			"patterns": [
-				{
-					"match": "(?x)\\b(?:sprintf|print(?:f|ln)?)\\b",
-					"name": "support.function.print.groovy"
-				}
-			]
-		},
 		"types": {
 			"patterns": [
 				{