github-linguist 5.3.3 → 6.0.0

data/grammars/source.j.json

@@ -1,20 +1,18 @@
 {
-  "fileTypes": [
-    "ijs"
-  ],
   "name": "J",
+  "scopeName": "source.j",
   "patterns": [
     {
-      "name": "string.j",
+      "name": "string.quoted.j",
       "match": "('[^']*')"
     },
     {
-      "name": "constant.numeric.j",
-      "match": "(_?\\d*\\.?\\d+)"
+      "name": "comment.line.j",
+      "match": "(?:^|[ )])(NB\\..*$)"
     },
     {
-      "name": "comment.j",
-      "match": "(?:^|[ )])(NB\\..*$)"
+      "name": "constant.numeric.j",
+      "match": "(?\u003c![_a-zA-Z])([_0-9][_0-9a-zA-Z]*\\.?[0-9a-zA-Z]*)(?![\\.\\:])"
     },
     {
       "name": "copula.global.j",
@@ -25,25 +23,24 @@
       "match": "=\\."
     },
     {
-      "name": "keyword.j",
-      "match": "(?:^|(?<=[) ]))((?:while\\.)|(?:whilst\\.)|(?:if\\.)|(?:elseif\\.)|(?:else\\.)|(?:do\\.)|(?:end\\.))"
+      "name": "keyword.control.j",
+      "match": "(?\u003c![_a-zA-Z0-9])((?:while\\.)|(?:whilst\\.)|(?:if\\.)|(?:elseif\\.)|(?:else\\.)|(?:do\\.)|(?:end\\.))"
     },
     {
-      "name": "noun.j",
-      "match": "(?:_(?=[^\\d:]))|(?:a[.:])"
+      "name": "keyword.other.noun.j",
+      "match": "((?\u003c![_a-zA-Z0-9])(_\\.|a\\.|a:)(?![\\.\\:]))"
     },
     {
-      "name": "conjunction.j",
-      "match": "(?:\\^\\:)|(?:[.:`@][.:]?)|(?:;\\.)|(?:![.:])|(?:[\"](?![.:]))|(?:\\&\\.?\\:?)|(?:[dHT]\\.)|(?:D[.:])|(?:[LS]\\:)"
+      "name": "keyword.operator.conjunction.j",
+      "match": "((?\u003c![_a-zA-Z0-9])(?:[dDHT]\\.)|(?\u003c![_a-zA-Z0-9])(?:[DLS]:)|(\u0026\\.:)|([\\;\\!\\@\u0026]\\.)|([\\^\\!\\`\\@\u0026]:)|([\\\"\\`\\@\u0026])|(\\s[\\.\\:][\\.\\:])|(\\s[\\.\\:]))(?![\\.\\:])"
     },
     {
-      "name": "adverb.j",
-      "match": "(?:[~}](?![.:]))|(?:[/\\\\]\\.?)|(?:[bfM]\\.)|(?:t[.:])"
+      "name": "keyword.operator.adverb.j",
+      "match": "(([\\/\\\\]\\.)|(?\u003c![_a-zA-Z0-9])(?:[bfMt]\\.)|(?\u003c![_a-zA-Z0-9])(?:t:)|([\\~\\/\\\\\\}]))(?![\\.\\:])"
     },
     {
-      "name": "verb.j",
-      "match": "(?:[=!](?![.:]))|(?:[<>+*%$|,#{-][.:]?)|(?:_\\:)|(?:\\^\\.?)|(?:\\^\\!\\.)|(?:[~}\"ip][.:])|(?:[;\\[]\\:?)|(?:[/\\\\]\\:)|\\]|(?:\\{\\:\\:)|(?:\\?\\.?)|(?:[AeEIjLr]\\.)|(?:p\\.\\.)|(?:[qsux0]\\:)|(?:_?[1-9]\\s?\\:)"
+      "name": "keyword.operator.verb.j",
+      "match": "((?:_?[0-9]\\:)|(?\u003c![_a-zA-Z0-9])(?:p\\.\\.)|(?\u003c![_a-zA-Z0-9])(?:[AcCeEiIjLopr]\\.)|(?\u003c![_a-zA-Z0-9])(?:[ipqsux]:)|({::)|([\u003c\u003e\\+\\*\\-\\%\\^\\$\\~\\|\\,\\#\\{\\}\"\\?]\\.)|([\u003c\u003e\\_\\+\\*\\-\\%\\$\\~\\|\\,\\;\\#\\/\\\\\\[\\{\\}\"]:)|([\u003c\u003e\\=\\+\\*\\-\\%\\^\\$\\|\\,\\;\\#\\!\\[\\]\\{\\?]))(?![\\.\\:])"
     }
-  ],
-  "scopeName": "source.j"
-}
+  ]
+}

data/grammars/source.jasmin.json

@@ -1,8 +1,6 @@
 {
-  "fileTypes": [
-    "j"
-  ],
   "name": "jasmin",
+  "scopeName": "source.jasmin",
   "patterns": [
     {
       "include": "#class-def"
@@ -68,50 +66,50 @@
           "include": "#directive"
         },
         {
+          "match": "([\\w/]+)(?=$|\\s+(?:;.*)?$)",
           "captures": {
             "1": {
               "name": "entity.name.type.jasmin"
             }
-          },
-          "match": "([\\w/]+)(?=$|\\s+(?:;.*)?$)"
+          }
         }
       ]
     },
     "comment": {
-      "match": "(?<=^|[ \t]);.*",
-      "name": "comment.line.jasmin"
+      "name": "comment.line.jasmin",
+      "match": "(?\u003c=^|[ \t]);.*"
     },
     "control": {
-      "match": "(?<=^|\\s)return(?=$|\\s)",
-      "name": "keyword.control.jasmin"
+      "name": "keyword.control.jasmin",
+      "match": "(?\u003c=^|\\s)return(?=$|\\s)"
     },
     "directive": {
-      "match": "(?<=^|\\s)\\.(?:catch|class|end method|field|implements|interface|limit|line|method|source|super|throws|var)(?=$|\\s)",
-      "name": "keyword.meta.directive.jasmin"
+      "name": "keyword.meta.directive.jasmin",
+      "match": "(?\u003c=^|\\s)\\.(?:catch|class|end method|field|implements|interface|limit|line|method|source|super|throws|var)(?=$|\\s)"
     },
     "double-string": {
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "name": "constant.character.escape.jasmin",
+          "match": "\\\\."
+        },
+        {
+          "name": "string.double.jasmin",
+          "match": "."
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "string.begin.jasmin"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "string.end.jasmin"
         }
-      },
-      "patterns": [
-        {
-          "match": "\\\\.",
-          "name": "constant.character.escape.jasmin"
-        },
-        {
-          "match": ".",
-          "name": "string.double.jasmin"
-        }
-      ]
+      }
     },
     "field-def": {
       "begin": "(?=\\.field)",
@@ -136,6 +134,7 @@
           "include": "#type-descriptor"
         },
         {
+          "match": "([\\w/]+)\\s+((?:\\[+)?(?:L[/\\w_]+;|[BCDFIJSZV]))(?=(\\s+)?[=]|(\\s+)?$|\\s+;)",
           "captures": {
             "1": {
               "name": "variable.parameter.jasmin"
@@ -143,8 +142,7 @@
             "2": {
               "name": "storage.type.type-descriptor.jasmin"
             }
-          },
-          "match": "([\\w/]+)\\s+((?:\\[+)?(?:L[/\\w_]+;|[BCDFIJSZV]))(?=(\\s+)?[=]|(\\s+)?$|\\s+;)"
+          }
         }
       ]
     },
@@ -156,6 +154,7 @@
           "include": "#comment"
         },
         {
+          "match": "(\\.implements)\\s+([\\w/]+)",
           "captures": {
             "1": {
               "name": "keyword.meta.directive.jasmin"
@@ -163,8 +162,7 @@
             "2": {
               "name": "entity.other.inherited-class.jasmin"
             }
-          },
-          "match": "(\\.implements)\\s+([\\w/]+)"
+          }
         }
       ]
     },
@@ -182,18 +180,18 @@
           "include": "#directive"
         },
         {
+          "match": "([\\w/]+)(?=$|\\s+(?:;.*)?$)",
           "captures": {
             "1": {
               "name": "entity.name.type.jasmin"
             }
-          },
-          "match": "([\\w/]+)(?=$|\\s+(?:;.*)?$)"
+          }
         }
       ]
     },
     "label": {
-      "match": "^[^0-9][^=^:.\"-]*:",
-      "name": "keyword.meta.label.jasmin"
+      "name": "keyword.meta.label.jasmin",
+      "match": "^[^0-9][^=^:.\"-]*:"
     },
     "method-def": {
       "begin": "(?=\\.method)",
@@ -212,22 +210,22 @@
           "include": "#type-descriptor"
         },
         {
+          "match": "([\\w/\u003c\u003e]+)(?=\\()",
           "captures": {
             "1": {
               "name": "entity.name.function.jasmin"
             }
-          },
-          "match": "([\\w/<>]+)(?=\\()"
+          }
         }
       ]
     },
     "modifier": {
-      "match": "(?<=^|\\s)(?:final|static|abstract|public|friend|protected|private)(?=$|\\s)",
-      "name": "storage.modifier.jasmin"
+      "name": "storage.modifier.jasmin",
+      "match": "(?\u003c=^|\\s)(?:final|static|abstract|public|friend|protected|private)(?=$|\\s)"
     },
     "number": {
-      "match": "(?<=^|[\\s(,=])[-+]?(?:[1-9][0-9]*|[-+]?(?:0?\\.|[1-9]\\.)[0-9]+|0x[0-9A-F]+|0)(?=$|[\\s,)=])",
-      "name": "constant.numeric.jasmin"
+      "name": "constant.numeric.jasmin",
+      "match": "(?\u003c=^|[\\s(,=])[-+]?(?:[1-9][0-9]*|[-+]?(?:0?\\.|[1-9]\\.)[0-9]+|0x[0-9A-F]+|0)(?=$|[\\s,)=])"
     },
     "super-def": {
       "begin": "(?=\\.super)",
@@ -237,6 +235,7 @@
           "include": "#comment"
         },
         {
+          "match": "(\\.super)\\s+([\\w/]+)",
           "captures": {
             "1": {
               "name": "keyword.meta.directive.jasmin"
@@ -244,18 +243,17 @@
             "2": {
               "name": "entity.other.inherited-class.jasmin"
             }
-          },
-          "match": "(\\.super)\\s+([\\w/]+)"
+          }
         }
       ]
     },
     "true-false-null": {
-      "match": "(?<=^|[\\s(,])(?:null|false|true)(?=$|[\\s,)])",
-      "name": "constant.language.jasmin"
+      "name": "constant.language.jasmin",
+      "match": "(?\u003c=^|[\\s(,])(?:null|false|true)(?=$|[\\s,)])"
     },
     "type-descriptor": {
-      "match": "(?<=^|[\\s()=,])(?:(?:\\[+)?(?:L[/\\w_]+;|[BCDFIJSZV]))(?=$|[\\s,)=])",
-      "name": "storage.type.type-descriptor.jasmin"
+      "name": "storage.type.type-descriptor.jasmin",
+      "match": "(?\u003c=^|[\\s()=,])(?:(?:\\[+)?(?:L[/\\w_]+;|[BCDFIJSZV]))(?=$|[\\s,)=])"
     },
     "var-def": {
       "begin": "(?=\\.var)",
@@ -265,6 +263,7 @@
           "include": "#comment"
         },
         {
+          "match": "(\\.var)\\s+([1-9][0-9]*|[0])\\s+(is)\\s+([\\w_]+)\\s+((?:\\[+)?(?:L[/\\w_]+;|[BCDFIJSZV]))\\s+(from)\\s+(?:[\\w_]+)\\s+(to)\\s+(?:[\\w_]+)",
           "captures": {
             "1": {
               "name": "keyword.meta.directive.jasmin"
@@ -287,13 +286,9 @@
             "7": {
               "name": "keyword.meta.to.jasmin"
             }
-          },
-          "comment": ".var <var-number> is <name> <descriptor> from <label1> to <label2>",
-          "match": "(\\.var)\\s+([1-9][0-9]*|[0])\\s+(is)\\s+([\\w_]+)\\s+((?:\\[+)?(?:L[/\\w_]+;|[BCDFIJSZV]))\\s+(from)\\s+(?:[\\w_]+)\\s+(to)\\s+(?:[\\w_]+)"
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.jasmin",
-  "uuid": "379c2786-2b36-4771-bece-72167eaba5c4"
-}
+  }
+}

data/grammars/source.java-properties.json

@@ -1,14 +1,8 @@
 {
-  "fileTypes": [
-    "properties"
-  ],
-  "foldingStartMarker": "^[a-zA-Z0-9.-_]+=.*\\\n",
-  "foldingStopMarker": "^(.*(?<!\\)\n)",
-  "keyEquivalent": "^~J",
   "name": "Java Properties",
+  "scopeName": "source.java-properties",
   "patterns": [
     {
-      "comment": "Ignore blank lines",
       "match": "^\\s*$"
     },
     {
@@ -23,6 +17,8 @@
   ],
   "repository": {
     "comment-line": {
+      "name": "comment.line.java-properties",
+      "match": "^(\\s*)([#!])(.+)?$\\n?",
       "captures": {
         "1": {
           "name": "punctuation.whitespace.comment.leading.java-properties"
@@ -30,12 +26,27 @@
         "2": {
           "name": "punctuation.definition.comment.java-properties"
         }
-      },
-      "match": "^(\\s*)([#!])(.+)?$\\n?",
-      "name": "comment.line.java-properties"
+      }
     },
     "property-definition": {
+      "name": "meta.key-value.java-properties",
+      "contentName": "string.unquoted.java-properties",
       "begin": "^(\\s*)((?:\\\\[ \\t]|\\\\:|\\\\=|[^:=\\s])+)(?:\\s*([:=]))?\\s*",
+      "end": "(?\u003c!\\\\{1})$\\n",
+      "patterns": [
+        {
+          "name": "punctuation.whitespace.leading.java-properties",
+          "match": "^\\s*"
+        },
+        {
+          "name": "punctuation.separator.continuation.java-properties",
+          "match": "(\\\\{1})(?=$\\n)"
+        },
+        {
+          "name": "constant.character.escape.java-properties",
+          "match": "\\\\(?:[\\\\ntfr\\\"']|u[0-9A-Fa-f]{4})"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.whitespace.leading.java-properties"
@@ -44,35 +55,19 @@
           "name": "support.constant.java-properties",
           "patterns": [
             {
-              "match": "\\\\(?:[ \\t:=\\\\ntfr\\\"']|u[0-9A-Fa-f]{4})",
-              "name": "constant.character.escape.java-properties"
+              "name": "constant.character.escape.java-properties",
+              "match": "\\\\(?:[ \\t:=\\\\ntfr\\\"']|u[0-9A-Fa-f]{4})"
             }
           ]
         },
         "3": {
           "name": "punctuation.separator.key-value.java-properties"
         }
-      },
-      "contentName": "string.unquoted.java-properties",
-      "end": "(?<!\\\\{1})$\\n",
-      "name": "meta.key-value.java-properties",
-      "patterns": [
-        {
-          "comment": "Leading space on a continued line is ignored",
-          "match": "^\\s*",
-          "name": "punctuation.whitespace.leading.java-properties"
-        },
-        {
-          "match": "(\\\\{1})(?=$\\n)",
-          "name": "punctuation.separator.continuation.java-properties"
-        },
-        {
-          "match": "\\\\(?:[\\\\ntfr\\\"']|u[0-9A-Fa-f]{4})",
-          "name": "constant.character.escape.java-properties"
-        }
-      ]
+      }
     },
     "property-name": {
+      "name": "meta.key-value.java-properties",
+      "match": "^(\\s*)((?:\\\\[ \\t]|\\\\:|\\\\=|[^:=\\s])+)(?:\\s*([:=]))?\\s*$\\n",
       "captures": {
         "1": {
           "name": "punctuation.whitespace.comment.leading.java-properties"
@@ -81,17 +76,12 @@
           "name": "support.constant.java-properties",
           "patterns": [
             {
-              "match": "\\\\(?:[ \\t:=\\\\ntfr\\\"']|u[0-9A-Fa-f]{4})",
-              "name": "constant.character.escape.java-properties"
+              "name": "constant.character.escape.java-properties",
+              "match": "\\\\(?:[ \\t:=\\\\ntfr\\\"']|u[0-9A-Fa-f]{4})"
             }
           ]
         }
-      },
-      "comment": "A property name with no value",
-      "match": "^(\\s*)((?:\\\\[ \\t]|\\\\:|\\\\=|[^:=\\s])+)(?:\\s*([:=]))?\\s*$\\n",
-      "name": "meta.key-value.java-properties"
+      }
     }
-  },
-  "scopeName": "source.java-properties",
-  "uuid": "D364E829-7643-4AFF-948D-3C0D6B4EA8A4"
-}
+  }
+}

data/grammars/source.java.json

@@ -1,12 +1,10 @@
 {
-  "fileTypes": [
-    "java",
-    "bsh"
-  ],
-  "keyEquivalent": "^~J",
   "name": "Java",
+  "scopeName": "source.java",
   "patterns": [
     {
+      "name": "meta.package.java",
+      "match": "^\\s*(package)\\b(?:\\s*([^ ;$]+)\\s*(;)?)?",
       "captures": {
         "1": {
           "name": "keyword.other.package.java"
@@ -17,17 +15,23 @@
         "3": {
           "name": "punctuation.terminator.java"
         }
-      },
-      "match": "^\\s*(package)\\b(?:\\s*([^ ;$]+)\\s*(;)?)?",
-      "name": "meta.package.java"
+      }
     },
     {
+      "name": "meta.import.java",
+      "contentName": "storage.modifier.import.java",
       "begin": "(import static)\\b\\s*",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.import.static.java"
+      "end": "\\s*(?:$|(;))",
+      "patterns": [
+        {
+          "name": "punctuation.separator.java",
+          "match": "\\."
+        },
+        {
+          "name": "invalid.illegal.character_not_allowed_here.java",
+          "match": "\\s"
         }
-      },
+      ],
       "captures": {
         "1": {
           "name": "keyword.other.import.java"
@@ -39,32 +43,32 @@
           "name": "punctuation.terminator.java"
         }
       },
-      "contentName": "storage.modifier.import.java",
-      "end": "\\s*(?:$|(;))",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.import.static.java"
+        }
+      },
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.java"
         }
-      },
+      }
+    },
+    {
       "name": "meta.import.java",
+      "contentName": "storage.modifier.import.java",
+      "begin": "(import)\\b\\s*",
+      "end": "\\s*(?:$|(;))",
       "patterns": [
         {
-          "match": "\\.",
-          "name": "punctuation.separator.java"
+          "name": "punctuation.separator.java",
+          "match": "\\."
         },
         {
-          "match": "\\s",
-          "name": "invalid.illegal.character_not_allowed_here.java"
-        }
-      ]
-    },
-    {
-      "begin": "(import)\\b\\s*",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.import.java"
+          "name": "invalid.illegal.character_not_allowed_here.java",
+          "match": "\\s"
         }
-      },
+      ],
       "captures": {
         "1": {
           "name": "keyword.other.import.java"
@@ -76,24 +80,16 @@
           "name": "punctuation.terminator.java"
         }
       },
-      "contentName": "storage.modifier.import.java",
-      "end": "\\s*(?:$|(;))",
-      "endCaptures": {
+      "beginCaptures": {
         "1": {
-          "name": "punctuation.terminator.java"
+          "name": "keyword.other.import.java"
         }
       },
-      "name": "meta.import.java",
-      "patterns": [
-        {
-          "match": "\\.",
-          "name": "punctuation.separator.java"
-        },
-        {
-          "match": "\\s",
-          "name": "invalid.illegal.character_not_allowed_here.java"
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.terminator.java"
         }
-      ]
+      }
     },
     {
       "include": "#code"
@@ -116,24 +112,12 @@
     "annotations": {
       "patterns": [
         {
+          "name": "meta.declaration.annotation.java",
           "begin": "(@[^ (]+)(\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.annotation.java"
-            },
-            "2": {
-              "name": "punctuation.definition.annotation-arguments.begin.java"
-            }
-          },
           "end": "(\\))",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.annotation-arguments.end.java"
-            }
-          },
-          "name": "meta.declaration.annotation.java",
           "patterns": [
             {
+              "match": "(\\w*)\\s*(=)",
               "captures": {
                 "1": {
                   "name": "constant.other.key.java"
@@ -141,46 +125,43 @@
                 "2": {
                   "name": "keyword.operator.assignment.java"
                 }
-              },
-              "match": "(\\w*)\\s*(=)"
+              }
             },
             {
               "include": "#code"
             },
             {
-              "match": ",",
-              "name": "punctuation.separator.property.java"
+              "name": "punctuation.separator.property.java",
+              "match": ","
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.annotation.java"
+            },
+            "2": {
+              "name": "punctuation.definition.annotation-arguments.begin.java"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.annotation-arguments.end.java"
+            }
+          }
         },
         {
-          "match": "@\\w*",
-          "name": "storage.type.annotation.java"
+          "name": "storage.type.annotation.java",
+          "match": "@\\w*"
         }
       ]
     },
     "anonymous-classes-and-new": {
       "begin": "\\bnew\\b",
-      "beginCaptures": {
-        "0": {
-          "name": "keyword.control.new.java"
-        }
-      },
-      "end": "(?<=\\)|\\])(?!\\s*{)|(?<=})|(?=;)",
+      "end": "(?\u003c=\\)|\\])(?!\\s*{)|(?\u003c=})|(?=;)",
       "patterns": [
         {
           "begin": "(\\w+)\\s*(?=\\[)",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.java"
-            }
-          },
           "end": "(})|(?=\\s*(?:,|;|\\)))",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.section.block.end.java"
-            }
-          },
           "patterns": [
             {
               "begin": "\\[",
@@ -193,97 +174,107 @@
             },
             {
               "begin": "{",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.section.block.begin.java"
-                }
-              },
               "end": "(?=})",
               "patterns": [
                 {
                   "include": "#code"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.section.block.begin.java"
+                }
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.java"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.block.end.java"
+            }
+          }
         },
         {
           "begin": "(?=\\w.*\\()",
-          "end": "(?<=\\))",
+          "end": "(?\u003c=\\))",
           "patterns": [
             {
               "include": "#object-types"
             },
             {
               "begin": "\\(",
-              "beginCaptures": {
-                "1": {
-                  "name": "storage.type.java"
-                }
-              },
               "end": "\\)",
               "patterns": [
                 {
                   "include": "#code"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "storage.type.java"
+                }
+              }
             }
           ]
         },
         {
+          "name": "meta.inner-class.java",
           "begin": "{",
+          "end": "}",
+          "patterns": [
+            {
+              "include": "#class-body"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.inner-class.begin.java"
             }
           },
-          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.inner-class.end.java"
             }
-          },
-          "name": "meta.inner-class.java",
-          "patterns": [
-            {
-              "include": "#class-body"
-            }
-          ]
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.control.new.java"
+        }
+      }
     },
     "assertions": {
       "patterns": [
         {
+          "name": "meta.declaration.assertion.java",
           "begin": "\\b(assert)\\s",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.assert.java"
-            }
-          },
           "end": "$",
-          "name": "meta.declaration.assertion.java",
           "patterns": [
             {
-              "match": ":",
-              "name": "keyword.operator.assert.expression-seperator.java"
+              "name": "keyword.operator.assert.expression-seperator.java",
+              "match": ":"
             },
             {
               "include": "#code"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.assert.java"
+            }
+          }
         }
       ]
     },
     "class": {
+      "name": "meta.class.java",
       "begin": "(?=\\w?[\\w\\s]*(?:class|(?:@)?interface|enum)\\s+\\w+)",
       "end": "}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.class.end.java"
-        }
-      },
-      "name": "meta.class.java",
       "patterns": [
         {
           "include": "#storage-modifiers"
@@ -292,6 +283,8 @@
           "include": "#comments"
         },
         {
+          "name": "meta.class.identifier.java",
+          "match": "(class|(?:@)?interface|enum)\\s+(\\w+)",
           "captures": {
             "1": {
               "name": "storage.modifier.java"
@@ -299,19 +292,12 @@
             "2": {
               "name": "entity.name.type.class.java"
             }
-          },
-          "match": "(class|(?:@)?interface|enum)\\s+(\\w+)",
-          "name": "meta.class.identifier.java"
+          }
         },
         {
+          "name": "meta.definition.class.inherited.classes.java",
           "begin": "extends",
-          "beginCaptures": {
-            "0": {
-              "name": "storage.modifier.extends.java"
-            }
-          },
           "end": "(?={|implements)",
-          "name": "meta.definition.class.inherited.classes.java",
           "patterns": [
             {
               "include": "#object-types-inherited"
@@ -319,17 +305,17 @@
             {
               "include": "#comments"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "storage.modifier.extends.java"
+            }
+          }
         },
         {
+          "name": "meta.definition.class.implemented.interfaces.java",
           "begin": "(implements)\\s",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.modifier.implements.java"
-            }
-          },
           "end": "(?=\\s*extends|\\{)",
-          "name": "meta.definition.class.implemented.interfaces.java",
           "patterns": [
             {
               "include": "#object-types-inherited"
@@ -337,24 +323,34 @@
             {
               "include": "#comments"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.modifier.implements.java"
+            }
+          }
         },
         {
+          "name": "meta.class.body.java",
           "begin": "{",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.section.class.begin.java"
-            }
-          },
           "end": "(?=})",
-          "name": "meta.class.body.java",
           "patterns": [
             {
               "include": "#class-body"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.class.begin.java"
+            }
+          }
         }
-      ]
+      ],
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.class.end.java"
+        }
+      }
     },
     "class-body": {
       "patterns": [
@@ -394,22 +390,22 @@
         },
         {
           "begin": "{",
+          "end": "}",
+          "patterns": [
+            {
+              "include": "#code"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.block.begin.java"
             }
           },
-          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.block.end.java"
             }
-          },
-          "patterns": [
-            {
-              "include": "#code"
-            }
-          ]
+          }
         },
         {
           "include": "#assertions"
@@ -446,13 +442,13 @@
     "comments": {
       "patterns": [
         {
+          "name": "comment.block.empty.java",
+          "match": "/\\*\\*/",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.java"
             }
-          },
-          "match": "/\\*\\*/",
-          "name": "comment.block.empty.java"
+          }
         },
         {
           "include": "text.html.javadoc"
@@ -465,80 +461,80 @@
     "comments-inline": {
       "patterns": [
         {
+          "name": "comment.block.java",
           "begin": "/\\*",
+          "end": "\\*/",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.java"
             }
-          },
-          "end": "\\*/",
-          "name": "comment.block.java"
+          }
         },
         {
           "begin": "(^[ \\t]+)?(?=//)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.java"
-            }
-          },
           "end": "(?!\\G)",
           "patterns": [
             {
+              "name": "comment.line.double-slash.java",
               "begin": "//",
+              "end": "\\n",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.java"
                 }
-              },
-              "end": "\\n",
-              "name": "comment.line.double-slash.java"
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.java"
+            }
+          }
         }
       ]
     },
     "constants-and-special-vars": {
       "patterns": [
         {
-          "match": "\\b(true|false|null)\\b",
-          "name": "constant.language.java"
+          "name": "constant.language.java",
+          "match": "\\b(true|false|null)\\b"
         },
         {
-          "match": "\\b(this|super)\\b",
-          "name": "variable.language.java"
+          "name": "variable.language.java",
+          "match": "\\b(this|super)\\b"
         },
         {
-          "match": "\\b0[xX][0-9A-Fa-f]([0-9A-Fa-f_]*[0-9A-Fa-f])?[lL]?(?!\\w|\\.)",
-          "name": "constant.numeric.hex.java"
+          "name": "constant.numeric.hex.java",
+          "match": "\\b0[xX][0-9A-Fa-f]([0-9A-Fa-f_]*[0-9A-Fa-f])?[lL]?(?!\\w|\\.)"
         },
         {
-          "match": "\\b0[0-7_]*[0-7][lL]?\\b",
-          "name": "constant.numeric.octal.java"
+          "name": "constant.numeric.octal.java",
+          "match": "\\b0[0-7_]*[0-7][lL]?\\b"
         },
         {
-          "match": "\\b0[bB][01]([01_]*[01])?[lL]?\\b",
-          "name": "constant.numeric.binary.java"
+          "name": "constant.numeric.binary.java",
+          "match": "\\b0[bB][01]([01_]*[01])?[lL]?\\b"
         },
         {
-          "match": "\\b(0|[1-9]([0-9_]*[0-9])?)[lL]?(?!\\w|\\.)",
-          "name": "constant.numeric.integer.java"
+          "name": "constant.numeric.integer.java",
+          "match": "\\b(0|[1-9]([0-9_]*[0-9])?)[lL]?(?!\\w|\\.)"
         },
         {
-          "match": "(?x)\n\t\t\t\t\t\t(?<!\\w)\t\t\t\t\t\t\t\t\t\t# Ensure word boundry\n\t\t\t\t\t\t(?>\n\t\t\t\t\t\t\t0[xX]\t\t\t\t\t\t\t\t\t# Start literal\n\t\t\t\t\t\t\t([0-9A-Fa-f]([0-9A-Fa-f_]*[0-9A-Fa-f])?)?\t\t\t\t\t\t# Optional Number\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t(?<=[0-9A-Fa-f])\\.\t\t\t\t\t\t\t# A number must exist on\n\t\t\t\t\t\t      | \\.(?=[0-9A-Fa-f])\t\t\t\t\t\t\t#   one side of the decimal\n\t\t\t\t\t\t      | (?<=[0-9A-Fa-f])\t\t\t\t\t\t\t\t# Decimal not required\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t([0-9A-Fa-f]([0-9A-Fa-f_]*[0-9A-Fa-f])?)?\t\t\t\t\t\t# Optional Number\n\t\t\t\t\t\t\t[pP]\t\t\t\t\t\t\t\t\t# Exponent Indicator\n\t\t\t\t\t\t\t[+-]?(0|[1-9]([0-9_]*[0-9])?)\t\t\t# Signed Integer\n\t\t\t\t\t\t\t[fFdD]?\t\t\t\t\t\t\t\t\t# Float Type Suffix\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(?!\\w)\t\t\t\t\t\t\t\t\t\t# Ensure word boundry\n\t\t\t\t\t",
-          "name": "constant.numeric.hex-float.java"
+          "name": "constant.numeric.hex-float.java",
+          "match": "(?x)\n\t\t\t\t\t\t(?\u003c!\\w)\t\t\t\t\t\t\t\t\t\t# Ensure word boundry\n\t\t\t\t\t\t(?\u003e\n\t\t\t\t\t\t\t0[xX]\t\t\t\t\t\t\t\t\t# Start literal\n\t\t\t\t\t\t\t([0-9A-Fa-f]([0-9A-Fa-f_]*[0-9A-Fa-f])?)?\t\t\t\t\t\t# Optional Number\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t(?\u003c=[0-9A-Fa-f])\\.\t\t\t\t\t\t\t# A number must exist on\n\t\t\t\t\t\t      | \\.(?=[0-9A-Fa-f])\t\t\t\t\t\t\t#   one side of the decimal\n\t\t\t\t\t\t      | (?\u003c=[0-9A-Fa-f])\t\t\t\t\t\t\t\t# Decimal not required\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t([0-9A-Fa-f]([0-9A-Fa-f_]*[0-9A-Fa-f])?)?\t\t\t\t\t\t# Optional Number\n\t\t\t\t\t\t\t[pP]\t\t\t\t\t\t\t\t\t# Exponent Indicator\n\t\t\t\t\t\t\t[+-]?(0|[1-9]([0-9_]*[0-9])?)\t\t\t# Signed Integer\n\t\t\t\t\t\t\t[fFdD]?\t\t\t\t\t\t\t\t\t# Float Type Suffix\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(?!\\w)\t\t\t\t\t\t\t\t\t\t# Ensure word boundry\n\t\t\t\t\t"
         },
         {
-          "match": "(?x)\n\t\t\t\t\t\t(?<!\\w)\t\t\t\t\t\t\t\t\t\t\t# Ensure word boundry\n\t\t\t\t\t\t(?>\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t(0|[1-9]([0-9_]*[0-9])?)\t\t\t\t# Leading digits\n\t\t\t\t\t\t\t\t(?=[eEfFdD.])\t\t\t\t\t\t\t# Allow for numbers without .\n\t\t\t\t\t\t\t)?\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t(?<=[0-9])(?=[eEfFdD])\t\t\t\t\t# Allow for numbers without .\n\t\t\t\t\t\t\t  | \\.\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t[0-9]([0-9_]*[0-9])?\t\t\t\t\t# Numbers after .\n\t\t\t\t\t\t\t)?\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t[eE][+-]?(0|[1-9]([0-9_]*[0-9])?)\t\t# Exponent\n\t\t\t\t\t\t\t)?\n\t\t\t\t\t\t\t[fFdD]?\t\t\t\t\t\t\t\t\t\t# Float Type Suffix\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(?!\\w)\t\t\t\t\t\t\t\t\t\t\t# Ensure word boundry\n\t\t\t\t\t",
-          "name": "constant.numeric.float.java"
+          "name": "constant.numeric.float.java",
+          "match": "(?x)\n\t\t\t\t\t\t(?\u003c!\\w)\t\t\t\t\t\t\t\t\t\t\t# Ensure word boundry\n\t\t\t\t\t\t(?\u003e\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t(0|[1-9]([0-9_]*[0-9])?)\t\t\t\t# Leading digits\n\t\t\t\t\t\t\t\t(?=[eEfFdD.])\t\t\t\t\t\t\t# Allow for numbers without .\n\t\t\t\t\t\t\t)?\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t(?\u003c=[0-9])(?=[eEfFdD])\t\t\t\t\t# Allow for numbers without .\n\t\t\t\t\t\t\t  | \\.\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t[0-9]([0-9_]*[0-9])?\t\t\t\t\t# Numbers after .\n\t\t\t\t\t\t\t)?\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t[eE][+-]?(0|[1-9]([0-9_]*[0-9])?)\t\t# Exponent\n\t\t\t\t\t\t\t)?\n\t\t\t\t\t\t\t[fFdD]?\t\t\t\t\t\t\t\t\t\t# Float Type Suffix\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(?!\\w)\t\t\t\t\t\t\t\t\t\t\t# Ensure word boundry\n\t\t\t\t\t"
         },
         {
+          "name": "constant.other.java",
+          "match": "(\\.)?\\b([A-Z][A-Z0-9_]+)(?!\u003c|\\.class|\\s*\\w+\\s*=)\\b",
           "captures": {
             "1": {
               "name": "keyword.operator.dereference.java"
             }
-          },
-          "match": "(\\.)?\\b([A-Z][A-Z0-9_]+)(?!<|\\.class|\\s*\\w+\\s*=)\\b",
-          "name": "constant.other.java"
+          }
         }
       ]
     },
@@ -547,38 +543,38 @@
       "end": "(?=;|})",
       "patterns": [
         {
+          "name": "meta.enum.java",
           "begin": "\\w+",
-          "beginCaptures": {
-            "0": {
-              "name": "constant.other.enum.java"
-            }
-          },
           "end": "(?=,|;|})",
-          "name": "meta.enum.java",
           "patterns": [
             {
               "include": "#parens"
             },
             {
               "begin": "{",
+              "end": "}",
+              "patterns": [
+                {
+                  "include": "#class-body"
+                }
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.enum.begin.java"
                 }
               },
-              "end": "}",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.enum.end.java"
                 }
-              },
-              "patterns": [
-                {
-                  "include": "#class-body"
-                }
-              ]
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "constant.other.enum.java"
+            }
+          }
         },
         {
           "include": "#comments"
@@ -591,69 +587,80 @@
     "keywords": {
       "patterns": [
         {
-          "match": "\\b(try|catch|finally|throw)\\b",
-          "name": "keyword.control.catch-exception.java"
+          "name": "keyword.control.catch-exception.java",
+          "match": "\\b(try|catch|finally|throw)\\b"
         },
         {
-          "match": "\\?|:",
-          "name": "keyword.control.ternary.java"
+          "name": "keyword.control.ternary.java",
+          "match": "\\?|:"
         },
         {
-          "match": "\\b(return|break|case|continue|default|do|while|for|switch|if|else)\\b",
-          "name": "keyword.control.java"
+          "name": "keyword.control.java",
+          "match": "\\b(return|break|case|continue|default|do|while|for|switch|if|else)\\b"
         },
         {
-          "match": "\\b(instanceof)\\b",
-          "name": "keyword.operator.java"
+          "name": "keyword.operator.java",
+          "match": "\\b(instanceof)\\b"
         },
         {
-          "match": "(<<|>>>?|~|\\^)",
-          "name": "keyword.operator.bitwise.java"
+          "name": "keyword.operator.bitwise.java",
+          "match": "(\u003c\u003c|\u003e\u003e\u003e?|~|\\^)"
         },
         {
-          "match": "((&|\\^|\\||<<|>>>?)=)",
-          "name": "keyword.operator.assignment.bitwise.java"
+          "name": "keyword.operator.assignment.bitwise.java",
+          "match": "((\u0026|\\^|\\||\u003c\u003c|\u003e\u003e\u003e?)=)"
         },
         {
-          "match": "(===?|!=|<=|>=|<>|<|>)",
-          "name": "keyword.operator.comparison.java"
+          "name": "keyword.operator.comparison.java",
+          "match": "(===?|!=|\u003c=|\u003e=|\u003c\u003e|\u003c|\u003e)"
         },
         {
-          "match": "([+*/%-]=)",
-          "name": "keyword.operator.assignment.arithmetic.java"
+          "name": "keyword.operator.assignment.arithmetic.java",
+          "match": "([+*/%-]=)"
         },
         {
-          "match": "(=)",
-          "name": "keyword.operator.assignment.java"
+          "name": "keyword.operator.assignment.java",
+          "match": "(=)"
         },
         {
-          "match": "(\\-\\-|\\+\\+)",
-          "name": "keyword.operator.increment-decrement.java"
+          "name": "keyword.operator.increment-decrement.java",
+          "match": "(\\-\\-|\\+\\+)"
         },
         {
-          "match": "(\\-|\\+|\\*|\\/|%)",
-          "name": "keyword.operator.arithmetic.java"
+          "name": "keyword.operator.arithmetic.java",
+          "match": "(\\-|\\+|\\*|\\/|%)"
         },
         {
-          "match": "(!|&&|\\|\\|)",
-          "name": "keyword.operator.logical.java"
+          "name": "keyword.operator.logical.java",
+          "match": "(!|\u0026\u0026|\\|\\|)"
         },
         {
-          "match": "(\\||&)",
-          "name": "keyword.operator.bitwise.java"
+          "name": "keyword.operator.bitwise.java",
+          "match": "(\\||\u0026)"
         },
         {
-          "match": "(?<=\\S)\\.(?=\\S)",
-          "name": "keyword.operator.dereference.java"
+          "name": "keyword.operator.dereference.java",
+          "match": "(?\u003c=\\S)\\.(?=\\S)"
         },
         {
-          "match": ";",
-          "name": "punctuation.terminator.java"
+          "name": "punctuation.terminator.java",
+          "match": ";"
         }
       ]
     },
     "method-call": {
+      "name": "meta.method-call.java",
       "begin": "([\\w$]+)(\\()",
+      "end": "\\)",
+      "patterns": [
+        {
+          "name": "punctuation.definition.seperator.parameter.java",
+          "match": ","
+        },
+        {
+          "include": "#code"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "meta.method.java"
@@ -662,45 +669,24 @@
           "name": "punctuation.definition.method-parameters.begin.java"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.method-parameters.end.java"
         }
-      },
-      "name": "meta.method-call.java",
-      "patterns": [
-        {
-          "match": ",",
-          "name": "punctuation.definition.seperator.parameter.java"
-        },
-        {
-          "include": "#code"
-        }
-      ]
+      }
     },
     "methods": {
-      "begin": "(?!new)(?=[\\w<].*\\s+)(?=([^=/]|/(?!/))+\\()",
-      "end": "(})|(?=;)",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.section.method.end.java"
-        }
-      },
       "name": "meta.method.java",
+      "begin": "(?!new)(?=[\\w\u003c].*\\s+)(?=([^=/]|/(?!/))+\\()",
+      "end": "(})|(?=;)",
       "patterns": [
         {
           "include": "#storage-modifiers"
         },
         {
+          "name": "meta.method.identifier.java",
           "begin": "(\\w+)\\s*\\(",
-          "beginCaptures": {
-            "1": {
-              "name": "entity.name.function.java"
-            }
-          },
           "end": "\\)",
-          "name": "meta.method.identifier.java",
           "patterns": [
             {
               "include": "#parameters"
@@ -708,28 +694,32 @@
             {
               "include": "#comments"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.function.java"
+            }
+          }
         },
         {
-          "begin": "<",
-          "end": ">",
           "name": "storage.type.token.java",
+          "begin": "\u003c",
+          "end": "\u003e",
           "patterns": [
             {
               "include": "#object-types"
             },
             {
-              "begin": "<",
-              "comment": "This is just to support <>'s with no actual type prefix",
-              "end": ">|[^\\w\\s,\\[\\]<]",
-              "name": "storage.type.generic.java"
+              "name": "storage.type.generic.java",
+              "begin": "\u003c",
+              "end": "\u003e|[^\\w\\s,\\[\\]\u003c]"
             }
           ]
         },
         {
+          "name": "meta.method.return-type.java",
           "begin": "(?=\\w.*\\s+\\w+\\s*\\()",
           "end": "(?=\\w+\\s*\\()",
-          "name": "meta.method.return-type.java",
           "patterns": [
             {
               "include": "#all-types"
@@ -743,47 +733,51 @@
           "include": "#throws"
         },
         {
+          "name": "meta.method.body.java",
           "begin": "{",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.section.method.begin.java"
-            }
-          },
           "end": "(?=})",
-          "name": "meta.method.body.java",
           "patterns": [
             {
               "include": "#code"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.method.begin.java"
+            }
+          }
         },
         {
           "include": "#comments"
         }
-      ]
+      ],
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.section.method.end.java"
+        }
+      }
     },
     "object-types": {
       "patterns": [
         {
-          "begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)<",
-          "end": ">|[^\\w\\s,\\?<\\[\\]]",
           "name": "storage.type.generic.java",
+          "begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)\u003c",
+          "end": "\u003e|[^\\w\\s,\\?\u003c\\[\\]]",
           "patterns": [
             {
               "include": "#object-types"
             },
             {
-              "begin": "<",
-              "comment": "This is just to support <>'s with no actual type prefix",
-              "end": ">|[^\\w\\s,\\[\\]<]",
-              "name": "storage.type.generic.java"
+              "name": "storage.type.generic.java",
+              "begin": "\u003c",
+              "end": "\u003e|[^\\w\\s,\\[\\]\u003c]"
             }
           ]
         },
         {
+          "name": "storage.type.object.array.java",
           "begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)(?=\\[)",
           "end": "(?=[^\\]\\s])",
-          "name": "storage.type.object.array.java",
           "patterns": [
             {
               "begin": "\\[",
@@ -797,50 +791,49 @@
           ]
         },
         {
+          "name": "storage.type.java",
+          "match": "\\b(?:[a-z]\\w*(\\.))*[A-Z]+\\w*\\b",
           "captures": {
             "1": {
               "name": "keyword.operator.dereference.java"
             }
-          },
-          "match": "\\b(?:[a-z]\\w*(\\.))*[A-Z]+\\w*\\b",
-          "name": "storage.type.java"
+          }
         }
       ]
     },
     "object-types-inherited": {
       "patterns": [
         {
-          "begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)<",
-          "end": ">|[^\\w\\s,<]",
           "name": "entity.other.inherited-class.java",
+          "begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)\u003c",
+          "end": "\u003e|[^\\w\\s,\u003c]",
           "patterns": [
             {
               "include": "#object-types"
             },
             {
-              "begin": "<",
-              "comment": "This is just to support <>'s with no actual type prefix",
-              "end": ">|[^\\w\\s,<]",
-              "name": "storage.type.generic.java"
+              "name": "storage.type.generic.java",
+              "begin": "\u003c",
+              "end": "\u003e|[^\\w\\s,\u003c]"
             }
           ]
         },
         {
+          "name": "entity.other.inherited-class.java",
+          "match": "\\b(?:[a-z]\\w*(\\.))*[A-Z]+\\w*",
           "captures": {
             "1": {
               "name": "keyword.operator.dereference.java"
             }
-          },
-          "match": "\\b(?:[a-z]\\w*(\\.))*[A-Z]+\\w*",
-          "name": "entity.other.inherited-class.java"
+          }
         }
       ]
     },
     "parameters": {
       "patterns": [
         {
-          "match": "final",
-          "name": "storage.modifier.java"
+          "name": "storage.modifier.java",
+          "match": "final"
         },
         {
           "include": "#annotations"
@@ -855,8 +848,8 @@
           "include": "#object-types"
         },
         {
-          "match": "\\w+",
-          "name": "variable.parameter.java"
+          "name": "variable.parameter.java",
+          "match": "\\w+"
         }
       ]
     },
@@ -872,87 +865,87 @@
     "primitive-arrays": {
       "patterns": [
         {
-          "match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)(\\[\\])*\\b",
-          "name": "storage.type.primitive.array.java"
+          "name": "storage.type.primitive.array.java",
+          "match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)(\\[\\])*\\b"
         }
       ]
     },
     "primitive-types": {
       "patterns": [
         {
-          "match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)\\b",
-          "name": "storage.type.primitive.java"
+          "name": "storage.type.primitive.java",
+          "match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)\\b"
         }
       ]
     },
     "storage-modifiers": {
+      "match": "\\b(public|private|protected|static|final|native|synchronized|volatile|abstract|threadsafe|transient)\\b",
       "captures": {
         "1": {
           "name": "storage.modifier.java"
         }
-      },
-      "match": "\\b(public|private|protected|static|final|native|synchronized|volatile|abstract|threadsafe|transient)\\b"
+      }
     },
     "strings": {
       "patterns": [
         {
+          "name": "string.quoted.double.java",
           "begin": "\"",
+          "end": "\"",
+          "patterns": [
+            {
+              "name": "constant.character.escape.java",
+              "match": "\\\\."
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.java"
             }
           },
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.java"
             }
-          },
-          "name": "string.quoted.double.java",
-          "patterns": [
-            {
-              "match": "\\\\.",
-              "name": "constant.character.escape.java"
-            }
-          ]
+          }
         },
         {
+          "name": "string.quoted.single.java",
           "begin": "'",
+          "end": "'",
+          "patterns": [
+            {
+              "name": "constant.character.escape.java",
+              "match": "\\\\."
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.java"
             }
           },
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.java"
             }
-          },
-          "name": "string.quoted.single.java",
-          "patterns": [
-            {
-              "match": "\\\\.",
-              "name": "constant.character.escape.java"
-            }
-          ]
+          }
         }
       ]
     },
     "throws": {
+      "name": "meta.throwables.java",
       "begin": "throws",
-      "beginCaptures": {
-        "0": {
-          "name": "storage.modifier.java"
-        }
-      },
       "end": "(?={|;)",
-      "name": "meta.throwables.java",
       "patterns": [
         {
           "include": "#object-types"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "storage.modifier.java"
+        }
+      }
     },
     "values": {
       "patterns": [
@@ -968,62 +961,60 @@
       ]
     },
     "variables": {
-      "applyEndPatternLast": 1,
       "patterns": [
         {
-          "begin": "(?x:(?=\n                        (?:\n                            (?:private|protected|public|native|synchronized|volatile|abstract|threadsafe|transient|static|final) # visibility/modifier\n                                |\n                            (?:def)\n                                |\n                            (?:void|boolean|byte|char|short|int|float|long|double)\n                                |\n                            (?:(?:[a-z]\\w*\\.)*[A-Z]+\\w*) # object type\n                        )\n                        \\s+\n                        (?!private|protected|public|native|synchronized|volatile|abstract|threadsafe|transient|static|final|def|void|boolean|byte|char|short|int|float|long|double)\n                        [\\w\\d_<>\\[\\],\\?][\\w\\d_<>\\[\\],\\? \\t]*\n                        (?:=|$)\n                        \n\t\t\t\t\t))",
-          "end": "(?=;)",
           "name": "meta.definition.variable.java",
+          "begin": "(?x:(?=\n                        (?:\n                            (?:private|protected|public|native|synchronized|volatile|abstract|threadsafe|transient|static|final) # visibility/modifier\n                                |\n                            (?:def)\n                                |\n                            (?:void|boolean|byte|char|short|int|float|long|double)\n                                |\n                            (?:(?:[a-z]\\w*\\.)*[A-Z]+\\w*) # object type\n                        )\n                        \\s+\n                        (?!private|protected|public|native|synchronized|volatile|abstract|threadsafe|transient|static|final|def|void|boolean|byte|char|short|int|float|long|double)\n                        [\\w\\d_\u003c\u003e\\[\\],\\?][\\w\\d_\u003c\u003e\\[\\],\\? \\t]*\n                        (?:=|$)\n                        \n\t\t\t\t\t))",
+          "end": "(?=;)",
           "patterns": [
             {
               "match": "\\s"
             },
             {
+              "match": "([A-Z_0-9]+)\\s+(?=\\=)",
               "captures": {
                 "1": {
                   "name": "constant.other.variable.java"
                 }
-              },
-              "match": "([A-Z_0-9]+)\\s+(?=\\=)"
+              }
             },
             {
+              "match": "(\\w[^\\s,]*)\\s+(?=\\=)",
               "captures": {
                 "1": {
                   "name": "meta.definition.variable.name.java"
                 }
-              },
-              "match": "(\\w[^\\s,]*)\\s+(?=\\=)"
+              }
             },
             {
               "begin": "=",
-              "beginCaptures": {
-                "0": {
-                  "name": "keyword.operator.assignment.java"
-                }
-              },
               "end": "(?=;)",
               "patterns": [
                 {
                   "include": "#code"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "keyword.operator.assignment.java"
+                }
+              }
             },
             {
+              "match": "(\\w[^\\s=]*)(?=\\s*;)",
               "captures": {
                 "1": {
                   "name": "meta.definition.variable.name.java"
                 }
-              },
-              "match": "(\\w[^\\s=]*)(?=\\s*;)"
+              }
             },
             {
               "include": "#code"
             }
           ]
         }
-      ]
+      ],
+      "applyEndPatternLast": true
     }
-  },
-  "scopeName": "source.java",
-  "uuid": "2B449DF6-6B1D-11D9-94EC-000D93589AF6"
-}
+  }
+}