github-linguist 7.5.1 → 7.6.0

data/grammars/source.yara.json

@@ -30,7 +30,7 @@
     },
     {
       "name": "keyword.yara",
-      "match": "\\b(true|false|private|global|rule|strings|meta|condition|and|or|not|filesize|in|at|of|for|all|any|nocase|fullword|wide|ascii|xor|entrypoint|them|int8|int16|int32|uint8|uint16|uint32|include|import|matches|contains)\\b"
+      "match": "\\b(true|false|private|global|rule|strings|meta|condition|and|or|not|filesize|in|at|of|for|all|any|nocase|fullword|wide|ascii|xor|entrypoint|them|int8|int16|int32|int8be|int16be|int32be|uint8|uint16|uint32|uint8be|uint16be|uint32be|include|import|matches|contains)\\b"
     },
     {
       "name": "constant.numeric.yara",

data/grammars/source.yasnippet.json

@@ -3,13 +3,23 @@
   "scopeName": "source.yasnippet",
   "patterns": [
     {
-      "include": "#main"
+      "name": "meta.prologue.yasnippet",
+      "begin": "\\A(?=\\s*(?:$|#))",
+      "end": "(?:^|\\G)(?=\\s*(?:[^\\s#]|#+\\s*--\\s*$))",
+      "patterns": [
+        {
+          "include": "#prologue-lines"
+        }
+      ]
+    },
+    {
+      "include": "#body"
     }
   ],
   "repository": {
     "body": {
       "name": "meta.snippet-body.yasnippet",
-      "begin": "^\\s*(#+)\\s*(--)\\s*$\\n?",
+      "begin": "^\\s*((#+)\\s*(--)\\s*$\\n?|(?=[^\\s#]))",
       "end": "(?=A)B",
       "patterns": [
         {
@@ -29,13 +39,13 @@
         }
       ],
       "beginCaptures": {
-        "0": {
+        "1": {
           "name": "comment.line.number-sign.yasnippet"
         },
-        "1": {
+        "2": {
           "name": "punctuation.definition.comment.number-sign.yasnippet"
         },
-        "2": {
+        "3": {
           "name": "punctuation.terminator.double-dash.yasnippet"
         }
       }
@@ -240,16 +250,6 @@
         }
       }
     },
-    "main": {
-      "patterns": [
-        {
-          "include": "#prologue"
-        },
-        {
-          "include": "#body"
-        }
-      ]
-    },
     "numbered-placeholder": {
       "name": "meta.placeholder-field.numbered.$2-nth.yasnippet",
       "contentName": "string.unquoted.default-text.yasnippet",
@@ -316,16 +316,6 @@
         }
       ]
     },
-    "prologue": {
-      "name": "meta.prologue.yasnippet",
-      "begin": "\\A",
-      "end": "^(?=\\s*#+\\s*--\\s*$)",
-      "patterns": [
-        {
-          "include": "#prologue-lines"
-        }
-      ]
-    },
     "prologue-lines": {
       "begin": "^\\s*(#+)(?!\\s*--\\s*$)",
       "end": "$",

data/grammars/source.zeek.json

@@ -306,7 +306,7 @@
       }
     },
     {
-      "match": "\\b(event)\\s+((?:[A-Za-z_][A-Za-z_0-9]*)(?:::(?:[A-Za-z_][A-Za-z_0-9]*))*)(?=s*\\()",
+      "match": "\\b(event)\\s+((?:[A-Za-z_][A-Za-z_0-9]*)(?:::(?:[A-Za-z_][A-Za-z_0-9]*))*)(?=\\s*\\()",
       "captures": {
         "1": {
           "name": "storage.type.zeek"
@@ -317,7 +317,7 @@
       }
     },
     {
-      "match": "\\b(hook)\\s+((?:[A-Za-z_][A-Za-z_0-9]*)(?:::(?:[A-Za-z_][A-Za-z_0-9]*))*)(?=s*\\()",
+      "match": "\\b(hook)\\s+((?:[A-Za-z_][A-Za-z_0-9]*)(?:::(?:[A-Za-z_][A-Za-z_0-9]*))*)(?=\\s*\\()",
       "captures": {
         "1": {
           "name": "storage.type.zeek"
@@ -328,7 +328,7 @@
       }
     },
     {
-      "match": "\\b(function)\\s+((?:[A-Za-z_][A-Za-z_0-9]*)(?:::(?:[A-Za-z_][A-Za-z_0-9]*))*)(?=s*\\()",
+      "match": "\\b(function)\\s+((?:[A-Za-z_][A-Za-z_0-9]*)(?:::(?:[A-Za-z_][A-Za-z_0-9]*))*)(?=\\s*\\()",
       "captures": {
         "1": {
           "name": "storage.type.zeek"
@@ -382,7 +382,7 @@
     },
     {
       "name": "entity.name.function.call.zeek",
-      "match": "\\b((?:[A-Za-z_][A-Za-z_0-9]*)(?:::(?:[A-Za-z_][A-Za-z_0-9]*))*)(?=s*\\()"
+      "match": "\\b((?:[A-Za-z_][A-Za-z_0-9]*)(?:::(?:[A-Za-z_][A-Za-z_0-9]*))*)(?=\\s*\\()"
     },
     {
       "name": "punctuation.section.block.begin.zeek",

data/grammars/source.zig.json

@@ -3,275 +3,674 @@
   "scopeName": "source.zig",
   "patterns": [
     {
-      "include": "#storage"
-    },
-    {
-      "include": "#support"
-    },
-    {
-      "include": "#structure"
-    },
-    {
-      "include": "#statement"
-    },
-    {
-      "include": "#async-control"
-    },
-    {
-      "include": "#conditional"
-    },
-    {
-      "include": "#repeat"
-    },
-    {
-      "include": "#constant"
-    },
-    {
-      "include": "#keyword"
-    },
-    {
-      "include": "#type"
-    },
-    {
-      "include": "#type-int"
-    },
-    {
-      "include": "#type-c"
-    },
-    {
-      "include": "#boolean"
-    },
-    {
-      "include": "#operator"
-    },
-    {
-      "include": "#dec-float-number"
-    },
-    {
-      "include": "#hex-float-number"
-    },
-    {
-      "include": "#dec-number"
-    },
-    {
-      "include": "#hex-number"
-    },
-    {
-      "include": "#oct-number"
-    },
-    {
-      "include": "#bin-number"
-    },
-    {
-      "include": "#character"
-    },
-    {
-      "include": "#operators"
-    },
-    {
-      "include": "#comment-line"
-    },
-    {
-      "include": "#comment-line-doc"
-    },
-    {
-      "include": "#strings"
-    },
-    {
-      "include": "#multiline-strings"
-    },
-    {
-      "include": "#escaped_char"
+      "include": "#main"
     }
   ],
   "repository": {
-    "async-control": {
-      "name": "keyword.control.async.zig",
-      "match": "\\b(async|await|suspend|resume|cancel)\\b"
-    },
-    "bin-number": {
-      "name": "constant.numeric.bin.zig",
-      "match": "0b[01]+"
+    "block": {
+      "contentName": "meta.block.zig",
+      "begin": "([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")?\\s*(\\{)",
+      "end": "(\\})",
+      "patterns": [
+        {
+          "include": "#main"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.zig"
+        },
+        "2": {
+          "name": "punctuation.section.braces.begin.zig"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.section.braces.end.zig"
+        }
+      }
     },
-    "boolean": {
-      "name": "constant.language.zig",
-      "match": "\\b(true|false)\\b"
+    "character_escapes": {
+      "patterns": [
+        {
+          "name": "constant.character.escape.newline.zig",
+          "match": "\\\\n"
+        },
+        {
+          "name": "constant.character.escape.carrigereturn.zig",
+          "match": "\\\\r"
+        },
+        {
+          "name": "constant.character.escape.tabulator.zig",
+          "match": "\\\\t"
+        },
+        {
+          "name": "constant.character.escape.backslash.zig",
+          "match": "\\\\\\\\"
+        },
+        {
+          "name": "constant.character.escape.single-quote.zig",
+          "match": "\\\\'"
+        },
+        {
+          "name": "constant.character.escape.double-quote.zig",
+          "match": "\\\\\\\""
+        },
+        {
+          "name": "constant.character.escape.hexidecimal.zig",
+          "match": "\\\\x[a-fA-F0-9]{2}"
+        },
+        {
+          "name": "constant.character.escape.hexidecimal.zig",
+          "match": "\\\\u\\{[a-fA-F0-9]{1,6}\\}"
+        }
+      ]
     },
-    "character": {
-      "name": "string.quoted.double.zig",
-      "begin": "(\\')",
-      "end": "\\'",
+    "comments": {
       "patterns": [
         {
-          "include": "#escaped_char"
+          "name": "comment.line.todo.zig",
+          "match": "TODO"
         },
         {
-          "name": "invalid.illegal.character.zig",
-          "match": "(\\\\[^\\'][^\\']*?)"
+          "name": "comment.line.zig",
+          "begin": "//[^/]",
+          "end": "$\\n?",
+          "patterns": [
+            {
+              "include": "#todo"
+            }
+          ]
+        },
+        {
+          "name": "comment.line.documentation.zig",
+          "begin": "///",
+          "end": "$\\n?"
         }
       ]
     },
-    "comment-line": {
-      "name": "comment.line.zig",
-      "begin": "//[^/]",
-      "end": "$\\n?",
+    "constants": {
       "patterns": [
         {
-          "include": "#todo"
+          "name": "constant.language.zig",
+          "match": "\\b(null|undefined|true|false)\\b"
+        },
+        {
+          "name": "constant.numeric.integer.zig",
+          "match": "\\b(?\u003c!\\.)(-?[0-9]+)(?!\\.)\\b"
+        },
+        {
+          "name": "constant.numeric.integer.hexadecimal.zig",
+          "match": "\\b(?\u003c!\\.)(0x[a-fA-F0-9]+)(?!\\.)\\b"
+        },
+        {
+          "name": "constant.numeric.integer.octal.zig",
+          "match": "\\b(?\u003c!\\.)(0o[0-7]+)(?!\\.)\\b"
+        },
+        {
+          "name": "constant.numeric.integer.binary.zig",
+          "match": "\\b(?\u003c!\\.)(0b[01]+)(?!\\.)\\b"
+        },
+        {
+          "name": "constant.numeric.float.zig",
+          "match": "(?\u003c!\\.)(-?\\b[0-9]+(?:\\.[0-9]+)?(?:[eE][+-]?[0-9]+)?)(?!\\.)\\b"
+        },
+        {
+          "name": "constant.numeric.float.hexadecimal.zig",
+          "match": "(?\u003c!\\.)(-?\\b0x[a-fA-F0-9]+(?:\\.[a-fA-F0-9]+)?[pP]?(?:[+-]?[0-9]+)?)(?!\\.)\\b"
         }
       ]
     },
-    "comment-line-doc": {
-      "name": "comment.line.documentation.zig",
-      "begin": "///",
-      "end": "$\\n?"
+    "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"
+            }
+          }
+        },
+        {
+          "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"
+            }
+          }
+        },
+        {
+          "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"
+            }
+          }
+        },
+        {
+          "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"
+            }
+          }
+        },
+        {
+          "match": "\\b(error)(\\.)([a-zA-Z_]\\w*|@\\\".+\\\")",
+          "captures": {
+            "1": {
+              "name": "storage.type.error.zig"
+            },
+            "2": {
+              "name": "punctuation.accessor.zig"
+            },
+            "3": {
+              "name": "entity.name.error.zig"
+            }
+          }
+        }
+      ]
     },
-    "conditional": {
-      "name": "keyword.control.conditional.zig",
-      "match": "\\b(if|else|switch|and|or|try|catch|orelse)\\b"
+    "field_decl": {
+      "contentName": "storage.type.zig",
+      "begin": "([a-zA-Z_]\\w*|@\\\".+\\\")\\s*(:)\\s*",
+      "end": "(?:(,)|(?:\\n|\\r))",
+      "patterns": [
+        {
+          "include": "#main"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "variable.other.member.zig"
+        },
+        "2": {
+          "name": "punctuation.terminator.zig"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.separator.zig"
+        }
+      }
     },
-    "constant": {
-      "name": "constant.language.zig",
-      "match": "\\b(null|undefined)\\b"
+    "func_call": {
+      "contentName": "meta.function-call.zig",
+      "begin": "([a-zA-Z_]\\w*|@\\\".+\\\")(\\()",
+      "end": "(\\))",
+      "patterns": [
+        {
+          "include": "#main"
+        },
+        {
+          "match": "(?:(,)|(?:\\)))",
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.zig"
+            },
+            "2": {
+              "name": "punctuation.section.parens.end.zig"
+            }
+          }
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "variable.function.zig"
+        },
+        "2": {
+          "name": "punctuation.section.parens.begin.zig"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.section.parens.end.zig"
+        }
+      }
     },
-    "dec-float-number": {
-      "name": "constant.numeric.float.zig",
-      "match": "\\b-?[0-9]+(\\.[0-9]+)?([eE][+-]?[0-9]+)?\\b"
+    "keywords": {
+      "patterns": [
+        {
+          "name": "keyword.control.zig",
+          "match": "\\b(while|for|break|return|continue|asm|defer|errdefer|unreachable)\\b"
+        },
+        {
+          "name": "keyword.control.async.zig",
+          "match": "\\b(async|await|suspend|resume|cancel)\\b"
+        },
+        {
+          "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": "keyword.other.usingnamespace.zig",
+          "match": "\\busingnamespace\\b"
+        },
+        {
+          "name": "keyword.other.test.zig",
+          "match": "\\btest\\b"
+        }
+      ]
     },
-    "dec-number": {
-      "name": "constant.numeric.integer.zig",
-      "match": "\\b-?[0-9]+\\b"
+    "label": {
+      "patterns": [
+        {
+          "name": "entity.name.label.zig",
+          "match": "(?\u003c!\\w):([a-zA-Z_]\\w*|@\\\".+\\\")"
+        },
+        {
+          "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"
+            }
+          }
+        }
+      ]
     },
-    "escaped_char": {
+    "main": {
       "patterns": [
         {
-          "name": "string.quoted.escape.newline.zig",
-          "match": "\\\\n"
+          "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"
+            }
+          }
         },
         {
-          "name": "string.quoted.escape.carrigereturn.zig",
-          "match": "\\\\r"
+          "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"
+            }
+          }
         },
         {
-          "name": "string.quoted.escape.tabulator.zig",
-          "match": "\\\\t"
+          "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"
+            }
+          }
         },
         {
-          "name": "string.quoted.escape.backslash.zig",
-          "match": "\\\\\\\\"
+          "include": "#func_call"
         },
         {
-          "name": "string.quoted.escape.single-quote.zig",
-          "match": "\\\\'"
+          "include": "#label"
         },
         {
-          "name": "string.quoted.escape.double-quote.zig",
-          "match": "\\\\\\\""
+          "include": "#punctuation"
         },
         {
-          "name": "string.quoted.escape.hexidecimal.zig",
-          "match": "\\\\x[a-fA-F0-9]{2}"
+          "include": "#storage_modifier"
+        },
+        {
+          "include": "#container_decl"
+        },
+        {
+          "include": "#constants"
+        },
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#strings"
         },
         {
-          "name": "string.quoted.escape.hexidecimal.zig",
-          "match": "\\\\u[a-fA-F0-9]{4}"
+          "include": "#storage"
         },
         {
-          "name": "string.quoted.escape.hexidecimal.zig",
-          "match": "\\\\U[a-fA-F0-9]{6}"
+          "include": "#keywords"
+        },
+        {
+          "include": "#operators"
+        },
+        {
+          "include": "#support"
+        },
+        {
+          "include": "#field_decl"
+        },
+        {
+          "include": "#block"
         }
       ]
     },
-    "hex-float-number": {
-      "name": "constant.numeric.float.hex.zig",
-      "match": "\\b0x[a-fA-F0-9]+(\\.[a-fA-F0-9]+)?([pP][+-]?[0-9]+)?\\b"
-    },
-    "hex-number": {
-      "name": "constant.numeric.hex.zig",
-      "match": "\\b0x[a-fA-F0-9]+\\b"
-    },
-    "keyword": {
-      "name": "support.function.zig",
-      "match": "(?\u003c!\\w)(fn|use|test|@[^\\\"\\d][a-zA-Z_]\\w*)\\b"
-    },
-    "multiline-strings": {
-      "name": "string.quoted.other.zig",
-      "begin": "c?\\\\\\\\",
-      "end": "$\\n?"
-    },
-    "oct-number": {
-      "name": "constant.numeric.octal.zig",
-      "match": "\\b0o[0-7]+\\b"
-    },
-    "operator": {
+    "operators": {
       "patterns": [
         {
           "name": "keyword.operator.zig",
-          "match": "(==|!=)"
+          "match": "\\b!\\b"
+        },
+        {
+          "name": "keyword.operator.logical.zig",
+          "match": "(==|(?:!|\u003e|\u003c)=?)"
         },
         {
           "name": "keyword.operator.word.zig",
           "match": "\\b(and|or)\\b"
         },
+        {
+          "name": "keyword.operator.assignment.zig",
+          "match": "((?:(?:\\+|-|\\*)\\%?|/|%|\u003c\u003c|\u003e\u003e|\u0026|\\|(?=[^\\|])|\\^)?=)"
+        },
         {
           "name": "keyword.operator.arithmetic.zig",
-          "match": "(\\-\\%?|\\+%?|\\*%?|/[^/]|%)=?"
+          "match": "((?:\\+|-|(?\u003c=\\w)\\s*\\*)\\%?|/(?!/)|%)"
         },
         {
           "name": "keyword.operator.bitwise.zig",
-          "match": "(\\\u003c\\\u003c%?|\u003e\u003e|!|\u0026|\\^|\\|)=?"
+          "match": "(\u003c\u003c|\u003e\u003e|\u0026(?=\\W)|\\|(?=[^\\|])|\\^|~)"
         },
         {
-          "name": "keyword.operator.special.zig",
-          "match": "(==|\\+\\+|\\*\\*)"
+          "name": "keyword.operator.other.zig",
+          "match": "(\\+\\+|\\*\\*|-\u003e|\\.\\?|\\.\\*|\u0026(?=\\w)|\\?|\\|\\||\\.\\.|\\.\\.\\.)"
         }
       ]
     },
-    "repeat": {
-      "name": "keyword.control.zig",
-      "match": "\\b(while|for)\\b"
+    "param_list": {
+      "contentName": "storage.type.zig",
+      "begin": "(comptime|noalias)?\\s*([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")\\s*(:)\\s*",
+      "end": "(?:(,)|(?:\\)))",
+      "patterns": [
+        {
+          "include": "#main"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.zig"
+        },
+        "2": {
+          "name": "variable.parameter.zig"
+        },
+        "3": {
+          "name": "punctuation.terminator.zig"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.separator.zig"
+        },
+        "2": {
+          "name": "punctuation.section.parens.end.zig"
+        }
+      }
     },
-    "statement": {
-      "name": "keyword.control.zig",
-      "match": "\\b(break|return|continue|asm|defer|errdefer|unreachable)\\b"
+    "punctuation": {
+      "patterns": [
+        {
+          "name": "punctuation.separator.zig",
+          "match": ","
+        },
+        {
+          "name": "punctuation.terminator.zig",
+          "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"
+            }
+          }
+        }
+      ]
     },
     "storage": {
-      "name": "storage.zig",
+      "patterns": [
+        {
+          "name": "storage.type.zig",
+          "match": "\\b(bool|void|noreturn|type|anyerror|promise)\\b"
+        },
+        {
+          "name": "storage.type.integer.zig",
+          "match": "\\b(?\u003c!\\.)([iu][0-9]\\d*|[iu]size|comptime_int)\\b"
+        },
+        {
+          "name": "storage.type.float.zig",
+          "match": "\\b(f16|f32|f64|f128|comptime_float)\\b"
+        },
+        {
+          "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"
+        }
+      ]
+    },
+    "storage_modifier": {
+      "name": "storage.modifier.zig",
       "match": "\\b(const|var|extern|packed|export|pub|noalias|inline|comptime|nakedcc|stdcallcc|volatile|align|linksection|threadlocal|allowzero)\\b"
     },
     "strings": {
-      "name": "string.quoted.double.zig",
-      "begin": "(c\\\"|\\\")",
-      "end": "\\\"",
       "patterns": [
         {
-          "include": "#escaped_char"
+          "name": "string.quoted.single.zig",
+          "begin": "\\'",
+          "end": "\\'",
+          "patterns": [
+            {
+              "include": "#character_escapes"
+            },
+            {
+              "name": "invalid.illegal.character.zig",
+              "match": "\\\\[^\\'][^\\']*?"
+            }
+          ]
         },
         {
-          "name": "invalid.illegal.character.zig",
-          "match": "(\\\\[^\\'][^\\']*?)"
+          "name": "string.quoted.double.zig",
+          "begin": "c?\\\"",
+          "end": "\\\"",
+          "patterns": [
+            {
+              "include": "#character_escapes"
+            },
+            {
+              "name": "invalid.illegal.character.zig",
+              "match": "\\\\[^\\'][^\\']*?"
+            }
+          ]
+        },
+        {
+          "name": "string.quoted.other.zig",
+          "begin": "c?\\\\\\\\",
+          "end": "$\\n?"
         }
       ]
     },
-    "structure": {
-      "name": "storage.type.zig",
-      "match": "\\b(union|struct|enum|error)\\b"
-    },
-    "todo": {
-      "name": "comment.line.todo.zig",
-      "match": "TODO"
-    },
-    "type": {
-      "name": "storage.type.zig",
-      "match": "\\b(bool|f16|f32|f64|f128|comptime_float|void|noreturn|type|anyerror|promise)\\b"
-    },
-    "type-c": {
-      "name": "storage.type.zig.c_compat",
-      "match": "\\b(c_short|c_ushort|c_int|c_uint|c_long|c_ulong|c_longlong|c_ulonglong|c_longdouble|c_void)\\b"
-    },
-    "type-int": {
-      "name": "storage.type.zig.integer",
-      "match": "\\b([iu][1-9]\\d*|i0|u0|isize|usize|comptime_int)\\b"
+    "support": {
+      "name": "support.function.zig",
+      "match": "(?\u003c!\\w)@[^\\\"\\d][a-zA-Z_]\\w*\\b"
     }
   }
 }