github-linguist 7.6.0 → 7.10.0

data/grammars/source.x86.json

@@ -170,11 +170,15 @@
     },
     {
       "name": "support.constant.preprocessor",
-      "match": "^\\s*(?\u003c!#)(?:#(?:#(?!#)|(?:un)?assert|define|elif|else|endif|error|ident|(?:ifn?|un)?def|if|import|include(?:_next)?|line|pragma|sccs|warning))|__(?:FILE|LINE|DATE|TIME(?:STAMP)?|STDC_(?:VERSION|HOSTED)?|GNUC|GNUC_MINOR|GNUC_PATCHLEVEL|VERSION|STRICT_ANSI|BASE_FILE|INCLUDE_LEVEL|OPTIMIZE|OPTIMIZE_SIZE|NO_INLINE|CHAR_UNSIGNED|CHAR_BIT|INT_SHORT|SCHAR_MAX|SHRT_MAX|INT_MAX|LONG_MAX|LONG_LONG_MAX|REGISTER_PREFIX|USER_LABEL_PREFIX)__\\b"
+      "match": "^\\s*(?\u003c!#)(?:#(?:#(?!#)|(?:un)?assert|define|elif|else|endif|error|ident|(?:ifn?|un)?def|if|import|include(?:_next)?|line|pragma|sccs|warning))\\b"
     },
     {
-      "name": "invalid.warnings",
-      "match": "^\\s*(?:#\\s+(?:(?:un)?assert|define|elif|else|endif|error|ident|(?:ifn?|un)?def|if|import|include(?:_next)?|line|pragma|sccs|warning)\\b).*"
+      "name": "support.constant.preprocessor",
+      "match": "\\b__(?:FILE|LINE|DATE|TIME(?:STAMP)?|STDC_(?:VERSION|HOSTED)?|GNUC(?:_MINOR|_PATCHLEVEL)?|VERSION|STRICT_ANSI|BASE_FILE|INCLUDE_LEVEL|OPTIMIZE(?:_SIZE)?|NO_INLINE|CHAR_UNSIGNED|CHAR_BIT|INT_SHORT|SCHAR_MAX|SHRT_MAX|INT_MAX|LONG_MAX|LONG_LONG_MAX|REGISTER_PREFIX|USER_LABEL_PREFIX)__\\b"
+    },
+    {
+      "name": "support.constant.preprocessor",
+      "match": "^\\s*(?:#\\s+(?:(?:un)?assert|define|elif|else|endif|error|ident|(?:ifn?|un)?def|if|import|include(?:_next)?|line|pragma|sccs|warning)\\b)"
     },
     {
       "name": "comment.assembly",

data/grammars/source.zig.json

@@ -3,17 +3,16 @@
   "scopeName": "source.zig",
   "patterns": [
     {
-      "include": "#main"
+      "include": "#dummy_main"
     }
   ],
   "repository": {
     "block": {
-      "contentName": "meta.block.zig",
-      "begin": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?\\s*(\\{)",
+      "begin": "([a-zA-Z_][\\w.]*|@\\\".+\\\")?\\s*(\\{)",
       "end": "(\\})",
       "patterns": [
         {
-          "include": "#main"
+          "include": "#dummy_main"
         }
       ],
       "beginCaptures": {
@@ -58,33 +57,29 @@
         },
         {
           "name": "constant.character.escape.hexidecimal.zig",
-          "match": "\\\\x[a-fA-F0-9]{2}"
+          "match": "\\\\x[a-fA-F\\d]{2}"
         },
         {
           "name": "constant.character.escape.hexidecimal.zig",
-          "match": "\\\\u\\{[a-fA-F0-9]{1,6}\\}"
+          "match": "\\\\u\\{[a-fA-F\\d]{1,6}\\}"
         }
       ]
     },
     "comments": {
       "patterns": [
         {
-          "name": "comment.line.todo.zig",
-          "match": "TODO"
+          "name": "comment.line.documentation.zig",
+          "begin": "///",
+          "end": "$\\n?"
         },
         {
-          "name": "comment.line.zig",
-          "begin": "//[^/]",
-          "end": "$\\n?",
-          "patterns": [
-            {
-              "include": "#todo"
-            }
-          ]
+          "name": "comment.line.todo.zig",
+          "begin": "//[^/]\\s*TODO",
+          "end": "$\\n?"
         },
         {
-          "name": "comment.line.documentation.zig",
-          "begin": "///",
+          "name": "comment.line.zig",
+          "begin": "//[^/]*",
           "end": "$\\n?"
         }
       ]
@@ -97,162 +92,47 @@
         },
         {
           "name": "constant.numeric.integer.zig",
-          "match": "\\b(?\u003c!\\.)(-?[0-9]+)(?!\\.)\\b"
+          "match": "\\b(?\u003c!\\.)(-?[\\d_]+)(?!\\.)\\b"
         },
         {
           "name": "constant.numeric.integer.hexadecimal.zig",
-          "match": "\\b(?\u003c!\\.)(0x[a-fA-F0-9]+)(?!\\.)\\b"
+          "match": "\\b(?\u003c!\\.)(0x[a-fA-F\\d_]+)(?!\\.)\\b"
         },
         {
           "name": "constant.numeric.integer.octal.zig",
-          "match": "\\b(?\u003c!\\.)(0o[0-7]+)(?!\\.)\\b"
+          "match": "\\b(?\u003c!\\.)(0o[0-7_]+)(?!\\.)\\b"
         },
         {
           "name": "constant.numeric.integer.binary.zig",
-          "match": "\\b(?\u003c!\\.)(0b[01]+)(?!\\.)\\b"
+          "match": "\\b(?\u003c!\\.)(0b[01_]+)(?!\\.)\\b"
         },
         {
           "name": "constant.numeric.float.zig",
-          "match": "(?\u003c!\\.)(-?\\b[0-9]+(?:\\.[0-9]+)?(?:[eE][+-]?[0-9]+)?)(?!\\.)\\b"
+          "match": "(?\u003c!\\.)(-?\\b[\\d_]+(?:\\.[\\d_]+)?(?:[eE][+-]?[\\d_]+)?)(?!\\.)\\b"
         },
         {
           "name": "constant.numeric.float.hexadecimal.zig",
-          "match": "(?\u003c!\\.)(-?\\b0x[a-fA-F0-9]+(?:\\.[a-fA-F0-9]+)?[pP]?(?:[+-]?[0-9]+)?)(?!\\.)\\b"
+          "match": "(?\u003c!\\.)(-?\\b0x[a-fA-F\\d_]+(?:\\.[a-fA-F\\d_]+)?[pP]?(?:[+-]?[\\d_]+)?)(?!\\.)\\b"
         }
       ]
     },
     "container_decl": {
       "patterns": [
         {
-          "contentName": "meta.union",
-          "begin": "(?:([a-zA-Z_]\\w*|@\\\".+\\\")\\s*=\\s*)?\\b(packed|extern)?\\b\\s*(union\\b)(?:(\\()([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")(\\)))?\\s*({)",
-          "end": "(})",
-          "patterns": [
-            {
-              "include": "#main"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "entity.name.union.zig"
-            },
-            "2": {
-              "name": "storage.modifier.zig"
-            },
-            "3": {
-              "name": "storage.type.union.zig"
-            },
-            "4": {
-              "name": "punctuation.section.parens.begin.zig"
-            },
-            "5": {
-              "name": "storage.type.zig"
-            },
-            "6": {
-              "name": "punctuation.section.parens.end.zig"
-            },
-            "7": {
-              "name": "punctuation.section.braces.begin.zig"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.section.braces.end.zig"
-            }
-          }
+          "name": "entity.name.union.zig",
+          "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")?(?=\\s*=\\s*(?:extern|packed)?\\b\\s*(?:union)\\s*[(\\{])"
         },
         {
-          "contentName": "meta.struct.zig",
-          "begin": "(?:([a-zA-Z_]\\w*|@\\\".+\\\")\\s*=\\s*)?\\b(packed|extern)?\\b\\s*(struct)\\s*({)",
-          "end": "(})",
-          "patterns": [
-            {
-              "include": "#main"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "entity.name.struct.zig"
-            },
-            "2": {
-              "name": "storage.modifier.zig"
-            },
-            "3": {
-              "name": "storage.type.struct.zig"
-            },
-            "4": {
-              "name": "punctuation.section.braces.begin.zig"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.section.braces.end.zig"
-            }
-          }
+          "name": "entity.name.struct.zig",
+          "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")?(?=\\s*=\\s*(?:extern|packed)?\\b\\s*(?:struct)\\s*[(\\{])"
         },
         {
-          "contentName": "meta.enum.zig",
-          "begin": "(?:([a-zA-Z_]\\w*|@\\\".+\\\")\\s*=\\s*)?\\b(extern)?\\b\\s*(enum\\b)(?:(\\()([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")(\\)))?\\s*({)",
-          "end": "(})",
-          "patterns": [
-            {
-              "include": "#main"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "entity.name.enum.zig"
-            },
-            "2": {
-              "name": "storage.modifier.zig"
-            },
-            "3": {
-              "name": "storage.type.enum.zig"
-            },
-            "4": {
-              "name": "punctuation.section.parens.begin.zig"
-            },
-            "5": {
-              "name": "storage.type.zig"
-            },
-            "6": {
-              "name": "punctuation.section.parens.end.zig"
-            },
-            "7": {
-              "name": "punctuation.section.braces.begin.zig"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.section.braces.end.zig"
-            }
-          }
+          "name": "entity.name.enum.zig",
+          "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")?(?=\\s*=\\s*(?:extern|packed)?\\b\\s*(?:enum)\\s*[(\\{])"
         },
         {
-          "contentName": "meta.error.zig",
-          "begin": "(?:([a-zA-Z_]\\w*|@\\\".+\\\")\\s*=\\s*)?\\b(error)\\b\\s*({)",
-          "end": "(})",
-          "patterns": [
-            {
-              "include": "#main"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "entity.name.error.zig"
-            },
-            "2": {
-              "name": "storage.type.error.zig"
-            },
-            "3": {
-              "name": "punctuation.section.braces.begin.zig"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.section.braces.end.zig"
-            }
-          }
+          "name": "entity.name.error.zig",
+          "match": "\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")?(?=\\s*=\\s*(?:error)\\s*[(\\{])"
         },
         {
           "match": "\\b(error)(\\.)([a-zA-Z_]\\w*|@\\\".+\\\")",
@@ -270,13 +150,71 @@
         }
       ]
     },
+    "dummy_main": {
+      "patterns": [
+        {
+          "include": "#label"
+        },
+        {
+          "include": "#function_type"
+        },
+        {
+          "include": "#punctuation"
+        },
+        {
+          "include": "#storage_modifier"
+        },
+        {
+          "include": "#container_decl"
+        },
+        {
+          "include": "#constants"
+        },
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#strings"
+        },
+        {
+          "include": "#storage"
+        },
+        {
+          "include": "#keywords"
+        },
+        {
+          "include": "#operators"
+        },
+        {
+          "include": "#support"
+        },
+        {
+          "include": "#field_decl"
+        },
+        {
+          "include": "#block"
+        },
+        {
+          "include": "#function_def"
+        },
+        {
+          "include": "#function_call"
+        },
+        {
+          "include": "#enum_literal"
+        }
+      ]
+    },
+    "enum_literal": {
+      "name": "constant.language.enum",
+      "match": "(?\u003c!\\w|\\))(\\.(?:[a-zA-Z_]\\w*\\b|@\\\"[^\\\"]*\\\"))(?!\\(|\\s*=[^=\u003e])"
+    },
     "field_decl": {
-      "contentName": "storage.type.zig",
       "begin": "([a-zA-Z_]\\w*|@\\\".+\\\")\\s*(:)\\s*",
-      "end": "(?:(,)|(?:\\n|\\r))",
+      "end": "([a-zA-Z_][\\w.]*|@\\\".+\\\")?\\s*(?:(,)|(=)|$)",
       "patterns": [
         {
-          "include": "#main"
+          "include": "#dummy_main"
         }
       ],
       "beginCaptures": {
@@ -284,38 +222,46 @@
           "name": "variable.other.member.zig"
         },
         "2": {
-          "name": "punctuation.terminator.zig"
+          "name": "punctuation.separator.zig"
         }
       },
       "endCaptures": {
         "1": {
+          "name": "storage.type.zig"
+        },
+        "2": {
           "name": "punctuation.separator.zig"
+        },
+        "3": {
+          "name": "keyword.operator.assignment.zig"
         }
       }
     },
-    "func_call": {
-      "contentName": "meta.function-call.zig",
-      "begin": "([a-zA-Z_]\\w*|@\\\".+\\\")(\\()",
-      "end": "(\\))",
+    "function_call": {
+      "name": "variable.function.zig",
+      "match": "(?\u003c!fn)\\b([a-zA-Z_]\\w*|@\\\".+\\\")(?=\\s*\\()"
+    },
+    "function_def": {
+      "begin": "(?\u003c=fn)\\s+([a-zA-Z_]\\w*|@\\\".+\\\")(\\()",
+      "end": "(?\u003c=\\)[^\\)])\\s*([a-zA-Z_][\\w.]*|@\\\".+\\\")?(!)?\\s*(?:([a-zA-Z_][\\w.]*|@\\\".+\\\")\\b(?!\\s*\\())?",
       "patterns": [
         {
-          "include": "#main"
+          "include": "#label"
         },
         {
-          "match": "(?:(,)|(?:\\)))",
-          "captures": {
-            "1": {
-              "name": "punctuation.separator.zig"
-            },
-            "2": {
-              "name": "punctuation.section.parens.end.zig"
-            }
-          }
+          "include": "#param_list"
+        },
+        {
+          "name": "storage.type.zig",
+          "match": "([a-zA-Z_][\\w.]*|@\\\".+\\\")"
+        },
+        {
+          "include": "#dummy_main"
         }
       ],
       "beginCaptures": {
         "1": {
-          "name": "variable.function.zig"
+          "name": "entity.name.function"
         },
         "2": {
           "name": "punctuation.section.parens.begin.zig"
@@ -323,196 +269,92 @@
       },
       "endCaptures": {
         "1": {
-          "name": "punctuation.section.parens.end.zig"
+          "name": "storage.type.zig"
+        },
+        "2": {
+          "name": "keyword.operator.zig"
+        },
+        "3": {
+          "name": "storage.type.zig"
         }
       }
     },
-    "keywords": {
+    "function_type": {
+      "contentName": "meta.function.parameters.zig",
+      "begin": "\\b(fn)\\s*(\\()",
+      "end": "(?\u003c=\\)|\\})\\s*([a-zA-Z_][\\w.]*|@\\\".+\\\")?\\s*(!)?\\s*([a-zA-Z_][\\w.]*|@\\\".+\\\")",
       "patterns": [
         {
-          "name": "keyword.control.zig",
-          "match": "\\b(while|for|break|return|continue|asm|defer|errdefer|unreachable)\\b"
+          "include": "#label"
         },
         {
-          "name": "keyword.control.async.zig",
-          "match": "\\b(async|await|suspend|resume|cancel)\\b"
+          "include": "#param_list"
         },
         {
-          "name": "keyword.control.conditional.zig",
-          "match": "\\b(if|else|switch|try|catch|orelse)\\b"
-        },
-        {
-          "name": "keyword.control.import.zig",
-          "match": "(?\u003c!\\w)(@import|@cImport|@cInclude)\\b"
+          "name": "storage.type.zig",
+          "match": "([a-zA-Z_][\\w.]*|@\\\".+\\\")"
         },
         {
-          "name": "keyword.other.usingnamespace.zig",
-          "match": "\\busingnamespace\\b"
+          "include": "#dummy_main"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.function.zig"
         },
-        {
-          "name": "keyword.other.test.zig",
-          "match": "\\btest\\b"
+        "2": {
+          "name": "punctuation.section.parens.begin.zig"
         }
-      ]
-    },
-    "label": {
-      "patterns": [
-        {
-          "name": "entity.name.label.zig",
-          "match": "(?\u003c!\\w):([a-zA-Z_]\\w*|@\\\".+\\\")"
+      },
+      "endCaptures": {
+        "1": {
+          "name": "storage.type.zig"
         },
-        {
-          "begin": "([a-zA-Z_]\\w*|@\\\".+\\\"):\\s*(?:({)|(while|for))",
-          "end": "(})",
-          "patterns": [
-            {
-              "include": "#main"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "entity.name.label.zig"
-            },
-            "2": {
-              "name": "punctuation.section.braces.begin.zig"
-            },
-            "3": {
-              "name": "keyword.control.zig"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.section.braces.end.zig"
-            }
-          }
+        "2": {
+          "name": "keyword.operator.zig"
+        },
+        "3": {
+          "name": "storage.type.zig"
         }
-      ]
+      }
     },
-    "main": {
+    "keywords": {
       "patterns": [
         {
-          "contentName": "meta.parameters.zig",
-          "begin": "\\b(fn)(\\()",
-          "end": "(\\))\\s*([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?",
-          "patterns": [
-            {
-              "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")(,)?",
-              "captures": {
-                "1": {
-                  "name": "storage.type.zig"
-                },
-                "2": {
-                  "name": "punctuation.separator.zig"
-                }
-              }
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.function.zig"
-            },
-            "2": {
-              "name": "punctuation.section.parens.begin.zig"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.section.parens.end.zig"
-            },
-            "2": {
-              "name": "storage.type.zig"
-            }
-          }
-        },
-        {
-          "contentName": "meta.function.parameters.zig",
-          "begin": "\\b(fn)\\s+([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")(\\()",
-          "end": "(?\u003c=\\))\\s*([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?",
-          "patterns": [
-            {
-              "include": "#param_list"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.function.zig"
-            },
-            "2": {
-              "name": "entity.name.function.zig"
-            },
-            "3": {
-              "name": "punctuation.section.parens.begin.zig"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "storage.type.zig"
-            }
-          }
-        },
-        {
-          "match": "\\b(const|var)\\s+([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")\\s*(:)\\s*([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")\\s*(=)",
-          "captures": {
-            "1": {
-              "name": "storage.modifier.zig"
-            },
-            "2": {
-              "name": "variable.other.zig"
-            },
-            "3": {
-              "name": "punctuation.terminator.zig"
-            },
-            "4": {
-              "name": "storage.type.zig"
-            },
-            "5": {
-              "name": "keyword.operator.assignment.zig"
-            }
-          }
-        },
-        {
-          "include": "#func_call"
-        },
-        {
-          "include": "#label"
-        },
-        {
-          "include": "#punctuation"
-        },
-        {
-          "include": "#storage_modifier"
-        },
-        {
-          "include": "#container_decl"
-        },
-        {
-          "include": "#constants"
-        },
-        {
-          "include": "#comments"
-        },
-        {
-          "include": "#strings"
+          "name": "keyword.control.zig",
+          "match": "\\b(while|for|break|return|continue|asm|defer|errdefer|unreachable)\\b"
         },
         {
-          "include": "#storage"
+          "name": "keyword.control.async.zig",
+          "match": "\\b(noasync|async|await|suspend|resume|cancel)\\b"
         },
         {
-          "include": "#keywords"
+          "name": "keyword.control.conditional.zig",
+          "match": "\\b(if|else|switch|try|catch|orelse)\\b"
         },
         {
-          "include": "#operators"
+          "name": "keyword.control.import.zig",
+          "match": "(?\u003c!\\w)(@import|@cImport|@cInclude)\\b"
         },
         {
-          "include": "#support"
+          "name": "keyword.other.usingnamespace.zig",
+          "match": "\\b(usingnamespace)\\b"
+        }
+      ]
+    },
+    "label": {
+      "match": "\\b(break|continue)\\s*:\\s*([a-zA-Z_]\\w*|@\\\".+\\\")\\b|\\b(?!\\d)([a-zA-Z_]\\w*|@\\\".+\\\")\\b(?=\\s*:\\s*(?:\\{|while\\b))",
+      "captures": {
+        "1": {
+          "name": "keyword.control.zig"
         },
-        {
-          "include": "#field_decl"
+        "2": {
+          "name": "entity.name.label.zig"
         },
-        {
-          "include": "#block"
+        "3": {
+          "name": "entity.name.label.zig"
         }
-      ]
+      }
     },
     "operators": {
       "patterns": [
@@ -534,43 +376,46 @@
         },
         {
           "name": "keyword.operator.arithmetic.zig",
-          "match": "((?:\\+|-|(?\u003c=\\w)\\s*\\*)\\%?|/(?!/)|%)"
+          "match": "((?:\\+|-|\\*)\\%?|/(?!/)|%)"
         },
         {
           "name": "keyword.operator.bitwise.zig",
-          "match": "(\u003c\u003c|\u003e\u003e|\u0026(?=\\W)|\\|(?=[^\\|])|\\^|~)"
+          "match": "(\u003c\u003c|\u003e\u003e|\u0026(?=[a-zA-Z_]|@\\\")|\\|(?=[^\\|])|\\^|~)"
         },
         {
           "name": "keyword.operator.other.zig",
-          "match": "(\\+\\+|\\*\\*|-\u003e|\\.\\?|\\.\\*|\u0026(?=\\w)|\\?|\\|\\||\\.\\.|\\.\\.\\.)"
+          "match": "(\\+\\+|\\*\\*|-\u003e|\\.\\?|\\.\\*|\u0026(?=[a-zA-Z_]|@\\\")|\\?|\\|\\||\\.{2,3})"
         }
       ]
     },
     "param_list": {
-      "contentName": "storage.type.zig",
-      "begin": "(comptime|noalias)?\\s*([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")\\s*(:)\\s*",
-      "end": "(?:(,)|(?:\\)))",
+      "begin": "([a-zA-Z_]\\w*|@\\\".+\\\")\\s*(:)\\s*",
+      "end": "([a-zA-Z_][\\w.]*|@\\\".+\\\")?\\s*(?:(,)|(\\)))",
       "patterns": [
         {
-          "include": "#main"
+          "include": "#dummy_main"
+        },
+        {
+          "name": "storage.type.zig",
+          "match": "([a-zA-Z_][\\w.]*|@\\\".+\\\")"
         }
       ],
       "beginCaptures": {
         "1": {
-          "name": "storage.modifier.zig"
-        },
-        "2": {
           "name": "variable.parameter.zig"
         },
-        "3": {
-          "name": "punctuation.terminator.zig"
+        "2": {
+          "name": "punctuation.separator.zig"
         }
       },
       "endCaptures": {
         "1": {
-          "name": "punctuation.separator.zig"
+          "name": "storage.type.zig"
         },
         "2": {
+          "name": "punctuation.separator.zig"
+        },
+        "3": {
           "name": "punctuation.section.parens.end.zig"
         }
       }
@@ -586,24 +431,12 @@
           "match": ";"
         },
         {
-          "contentName": "meta.group.zig",
-          "begin": "(\\()",
-          "end": "(\\))",
-          "patterns": [
-            {
-              "include": "#main"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.section.parens.begin.zig"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.section.parens.end.zig"
-            }
-          }
+          "name": "punctuation.section.parens.begin.zig",
+          "match": "(\\()"
+        },
+        {
+          "name": "punctuation.section.parens.end.zig",
+          "match": "(\\))"
         }
       ]
     },
@@ -611,11 +444,11 @@
       "patterns": [
         {
           "name": "storage.type.zig",
-          "match": "\\b(bool|void|noreturn|type|anyerror|promise)\\b"
+          "match": "\\b(bool|void|noreturn|type|anyerror)\\b"
         },
         {
           "name": "storage.type.integer.zig",
-          "match": "\\b(?\u003c!\\.)([iu][0-9]\\d*|[iu]size|comptime_int)\\b"
+          "match": "\\b(?\u003c!\\.)([iu]\\d+|[iu]size|comptime_int)\\b"
         },
         {
           "name": "storage.type.float.zig",
@@ -624,6 +457,44 @@
         {
           "name": "storage.type.c_compat.zig",
           "match": "\\b(c_short|c_ushort|c_int|c_uint|c_long|c_ulong|c_longlong|c_ulonglong|c_longdouble|c_void)\\b"
+        },
+        {
+          "match": "\\b(anyframe)\\b\\s*(-\u003e)?\\s*(?:([a-zA-Z_][\\w.]*|@\\\".+\\\")\\b(?!\\s*\\())?",
+          "captures": {
+            "1": {
+              "name": "storage.type.zig"
+            },
+            "2": {
+              "name": "keyword.operator.zig"
+            },
+            "3": {
+              "name": "storage.type.zig"
+            }
+          }
+        },
+        {
+          "name": "storage.type.function.zig",
+          "match": "\\bfn\\b"
+        },
+        {
+          "name": "storage.type.test.zig",
+          "match": "\\btest\\b"
+        },
+        {
+          "name": "storage.type.struct.zig",
+          "match": "\\bstruct\\b"
+        },
+        {
+          "name": "storage.type.enum.zig",
+          "match": "\\benum\\b"
+        },
+        {
+          "name": "storage.type.union.zig",
+          "match": "\\bunion\\b"
+        },
+        {
+          "name": "storage.type.error.zig",
+          "match": "\\berror\\b"
         }
       ]
     },