github-linguist 7.6.1 → 7.7.0

data/grammars/source.zig.json

@@ -8,7 +8,6 @@
   ],
   "repository": {
     "block": {
-      "contentName": "meta.block.zig",
       "begin": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?\\s*(\\{)",
       "end": "(\\})",
       "patterns": [
@@ -69,22 +68,18 @@
     "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?"
         }
       ]
@@ -124,135 +119,20 @@
     "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,10 +150,13 @@
         }
       ]
     },
+    "enum_literal": {
+      "name": "constant.language.enum",
+      "match": "(?\u003c!\\w|\\))(\\.(?:[a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\"))\\b(?!\\(|\\s*=\\s+)"
+    },
     "field_decl": {
-      "contentName": "storage.type.zig",
-      "begin": "([a-zA-Z_]\\w*|@\\\".+\\\")\\s*(:)\\s*",
-      "end": "(?:(,)|(?:\\n|\\r))",
+      "begin": "([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")\\s*(:)\\s*",
+      "end": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?\\s*(?:(,)|(=)|$)",
       "patterns": [
         {
           "include": "#main"
@@ -284,38 +167,85 @@
           "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_][a-zA-Z0-9_]*|@\\\".+\\\")(?=\\s*\\()"
+    },
+    "function_def": {
+      "begin": "(?\u003c=fn)\\s+([a-zA-Z_][a-zA-Z0-9_]*|@\\\".+\\\")(\\()",
+      "end": "(?\u003c=\\)[^\\)])\\s*([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?(!)?\\s*(?:([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")\\b(?!\\s*\\())?",
       "patterns": [
+        {
+          "include": "#label"
+        },
+        {
+          "include": "#param_list"
+        },
+        {
+          "name": "storage.type.zig",
+          "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")"
+        },
         {
           "include": "#main"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.function"
         },
+        "2": {
+          "name": "punctuation.section.parens.begin.zig"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "storage.type.zig"
+        },
+        "2": {
+          "name": "keyword.operator.zig"
+        },
+        "3": {
+          "name": "storage.type.zig"
+        }
+      }
+    },
+    "function_type": {
+      "contentName": "meta.function.parameters.zig",
+      "begin": "\\b(fn)\\s*(\\()",
+      "end": "(?\u003c=\\)|\\})\\s*([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?\\s*(!)?\\s*([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")",
+      "patterns": [
         {
-          "match": "(?:(,)|(?:\\)))",
-          "captures": {
-            "1": {
-              "name": "punctuation.separator.zig"
-            },
-            "2": {
-              "name": "punctuation.section.parens.end.zig"
-            }
-          }
+          "include": "#label"
+        },
+        {
+          "include": "#param_list"
+        },
+        {
+          "name": "storage.type.zig",
+          "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")"
+        },
+        {
+          "include": "#main"
         }
       ],
       "beginCaptures": {
         "1": {
-          "name": "variable.function.zig"
+          "name": "storage.type.function.zig"
         },
         "2": {
           "name": "punctuation.section.parens.begin.zig"
@@ -323,7 +253,13 @@
       },
       "endCaptures": {
         "1": {
-          "name": "punctuation.section.parens.end.zig"
+          "name": "storage.type.zig"
+        },
+        "2": {
+          "name": "keyword.operator.zig"
+        },
+        "3": {
+          "name": "storage.type.zig"
         }
       }
     },
@@ -335,7 +271,7 @@
         },
         {
           "name": "keyword.control.async.zig",
-          "match": "\\b(async|await|suspend|resume|cancel)\\b"
+          "match": "\\b(noasync|async|await|suspend|resume|cancel)\\b"
         },
         {
           "name": "keyword.control.conditional.zig",
@@ -347,132 +283,26 @@
         },
         {
           "name": "keyword.other.usingnamespace.zig",
-          "match": "\\busingnamespace\\b"
-        },
-        {
-          "name": "keyword.other.test.zig",
-          "match": "\\btest\\b"
+          "match": "\\b(usingnamespace)\\b"
         }
       ]
     },
     "label": {
-      "patterns": [
-        {
-          "name": "entity.name.label.zig",
-          "match": "(?\u003c!\\w):([a-zA-Z_]\\w*|@\\\".+\\\")"
+      "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"
         },
-        {
-          "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": "entity.name.label.zig"
+        },
+        "3": {
+          "name": "entity.name.label.zig"
         }
-      ]
+      }
     },
     "main": {
       "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"
         },
@@ -511,6 +341,12 @@
         },
         {
           "include": "#block"
+        },
+        {
+          "include": "#function_call"
+        },
+        {
+          "include": "#enum_literal"
         }
       ]
     },
@@ -534,43 +370,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_][a-zA-Z0-9_]*|@\\\".+\\\")\\s*(:)\\s*",
+      "end": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?\\s*(?:(,)|(\\)))",
       "patterns": [
         {
           "include": "#main"
+        },
+        {
+          "name": "storage.type.zig",
+          "match": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")"
         }
       ],
       "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 +425,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,7 +438,7 @@
       "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",
@@ -624,6 +451,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_][a-zA-Z0-9_.]*|@\\\".+\\\")\\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"
         }
       ]
     },