syntax/antlr.syntax in ultraviolet-0.10.0 vs syntax/antlr.syntax in ultraviolet-0.10.1

@@ -3,18 +3,29 @@
 fileTypes: 
 - g
 scopeName: source.antlr
 repository: 
   nested-curly: 
+    name: source.embedded.java-or-c.antlr
+    captures: 
+      "0": 
+        name: punctuation.section.group.antlr
+    begin: \{
+    end: \}
     patterns: 
-    - captures: 
-        "0": 
-          name: punctuation.section.group.antlr
-      begin: \{
-      end: \}
-      patterns: 
-      - include: "#nested-curly"
+    - name: keyword.control.java-or-c
+      match: \b(break|case|continue|default|do|else|for|goto|if|_Pragma|return|switch|while)\b
+    - name: storage.type.java-or-c
+      match: \b(asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\b
+    - name: storage.modifier.java-or-c
+      match: \b(const|extern|register|restrict|static|volatile|inline)\b
+    - name: constant.language.java-or-c
+      match: \b(NULL|true|false|TRUE|FALSE)\b
+    - name: keyword.operator.sizeof.java-or-c
+      match: \b(sizeof)\b
+    - name: constant.numeric.java-or-c
+      match: \b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\b
     - name: string.quoted.double.java-or-c
       endCaptures: 
         "0": 
           name: punctuation.definition.string.end.java-or-c
       begin: "\""
@@ -37,10 +48,11 @@
       patterns: 
       - name: constant.character.escape.antlr
         match: \\.
     - name: support.constant.eof-char.antlr
       match: \bEOF_CHAR\b
+    - include: "#comments"
   comments: 
     patterns: 
     - name: comment.block.antlr
       captures: 
         "0": 
@@ -102,27 +114,38 @@
       match: \b\d+\b
     - name: variable.other.option.antlr
       match: \b(k|charVocabulary|filter|greedy|paraphrase|exportVocab|buildAST|defaultErrorHandler|language|namespace|namespaceStd|namespaceAntlr|genHashLines)\b
     - name: constant.language.boolean.antlr
       match: \b(true|false)\b
-- name: keyword.control.label.antlr
-  match: ^\w+\s*(:|\s*$)
+- name: meta.definition.class.antlr
+  captures: 
+    "1": 
+      name: storage.type.antlr
+    "2": 
+      name: entity.name.type.class.antlr
+  begin: ^(class)\b\s+(\w+)
+  end: ;
+  patterns: 
+  - name: meta.definition.class.extends.antlr
+    captures: 
+      "1": 
+        name: storage.modifier.antlr
+    begin: \b(extends)\b\s+
+    end: (?=;)
+    patterns: 
+    - name: support.class.antlr
+      match: \b(Parser|Lexer|TreeWalker)\b
+- name: storage.modifier.antlr
+  match: ^protected\b
+- name: entity.name.type.token.antlr
+  match: ^[[:upper:]_][[:upper:][:digit:]_]*\b
+- name: meta.rule.antlr
+  captures: 
+    "1": 
+      name: entity.name.function.rule.antlr
+    "2": 
+      name: keyword.control.antlr
+  match: ^(\w+)(?:\s+(returns\b))?
 - name: constant.other.token.antlr
   match: \b[[:upper:]_][[:upper:][:digit:]_]*\b
-- name: source.embedded.java-or-c.antlr
-  endCaptures: 
-    "0": 
-      name: punctuation.section.embedded.end.antlr
-  begin: \{
-  beginCaptures: 
-    "0": 
-      name: punctuation.section.embedded.begin.antlr
-  end: \}
-  patterns: 
-  - include: "#nested-curly"
-- name: storage.type.class.antlr
-  match: \bclass\b
-- name: storage.modifier.extends.antlr
-  match: \bextends\b
-- name: support.class.antlr
-  match: \b(Parser|Lexer|TreeWalker)\b
+- include: "#nested-curly"
 keyEquivalent: ^~A