Update to more up-to-date zig tree-sitter repo

The previous tree-sitter repo seems to be unmaintained.

Switch to a more maintained tree-sitter repo.

I also fixed the queries: precedences, some helix captures, ...

languages.toml

@@ -1396,7 +1396,7 @@ args = { console = "internalConsole", attachCommands = [ "platform select remote
 
 [[grammar]]
 name = "zig"
-source = { git = "https://github.com/maxxnino/tree-sitter-zig", rev = "0d08703e4c3f426ec61695d7617415fff97029bd" }
+source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-zig", rev = "eb7d58c2dc4fbeea4745019dee8df013034ae66b" }
 
 [[language]]
 name = "prolog"

runtime/queries/zig/highlights.scm

@@ -1,220 +1,11 @@
-[
+; Comments
-  (container_doc_comment)
-  (doc_comment)
-] @comment.documentation
 
-[
+((comment) @comment.block.documentation
-  (line_comment)
+  (#lua-match? @comment.block.documentation "^//!"))
-] @comment.line
 
-;; assume TitleCase is a type
+(comment) @comment.line
-(
-  [
-    variable_type_function: (IDENTIFIER)
-    field_access: (IDENTIFIER)
-    parameter: (IDENTIFIER)
-  ] @type
-  (#match? @type "^[A-Z]([a-z]+[A-Za-z0-9]*)+$")
-)
 
-;; assume camelCase is a function
+; Punctuation
-(
-  [
-    variable_type_function: (IDENTIFIER)
-    field_access: (IDENTIFIER)
-    parameter: (IDENTIFIER)
-  ] @function
-  (#match? @function "^[a-z]+([A-Z][a-z0-9]*)+$")
-)
-
-;; assume all CAPS_1 is a constant
-(
-  [
-    variable_type_function: (IDENTIFIER)
-    field_access: (IDENTIFIER)
-  ] @constant
-  (#match? @constant "^[A-Z][A-Z_0-9]+$")
-)
-
-;; _
-(
-  (IDENTIFIER) @variable.builtin
-  (#eq? @variable.builtin "_")
-)
-
-;; C Pointers [*c]T
-(PtrTypeStart "c" @variable.builtin)
-
-[
-  variable: (IDENTIFIER)
-  variable_type_function: (IDENTIFIER)
-] @variable
-
-parameter: (IDENTIFIER) @variable.parameter
-
-[
-  field_member: (IDENTIFIER)
-  field_access: (IDENTIFIER)
-] @variable.other.member
-
-[
-  function_call: (IDENTIFIER)
-  function: (IDENTIFIER)
-] @function
-
-exception: "!" @keyword.control.exception
-
-field_constant: (IDENTIFIER) @constant
-
-(BUILTINIDENTIFIER) @function.builtin
-
-((BUILTINIDENTIFIER) @keyword.control.import
-  (#any-of? @keyword.control.import "@import" "@cImport"))
-
-(INTEGER) @constant.numeric.integer
-
-(FLOAT) @constant.numeric.float
-
-[
-  (LINESTRING)
-  (STRINGLITERALSINGLE)
-] @string
-
-(CHAR_LITERAL) @constant.character
-(EscapeSequence) @constant.character.escape
-(FormatSequence) @string.special
-
-[
-  "anytype"
-  "anyframe"
-  (BuildinTypeExpr)
-] @type.builtin
-
-(BreakLabel (IDENTIFIER) @label)
-(BlockLabel (IDENTIFIER) @label)
-
-[
-  "true"
-  "false"
-] @constant.builtin.boolean
-
-[
-  "undefined"
-  "unreachable"
-  "null"
-] @constant.builtin
-
-[
-  "else"
-  "if"
-  "switch"
-] @keyword.control.conditional
-
-[
-  "for"
-  "while"
-] @keyword.control.repeat
-
-[
-  "or"
-  "and"
-  "orelse"
-] @keyword.operator
-
-[
-  "enum"
-] @type.enum
-
-[
-  "struct"
-  "union"
-  "packed"
-  "opaque"
-  "export"
-  "extern"
-  "linksection"
-] @keyword.storage.type
-
-[
-  "const"
-  "var"
-  "threadlocal"
-  "allowzero"
-  "volatile"
-  "align"
-] @keyword.storage.modifier
-
-[
-  "try"
-  "error"
-  "catch"
-] @keyword.control.exception
-
-[
-  "fn"
-] @keyword.function
-
-[
-  "test"
-] @keyword
-
-[
-  "pub"
-  "usingnamespace"
-] @keyword.control.import
-
-[
-  "return"
-  "break"
-  "continue"
-] @keyword.control.return
-
-[
-  "defer"
-  "errdefer"
-  "async"
-  "nosuspend"
-  "await"
-  "suspend"
-  "resume"
-] @function.macro
-
-[
-  "comptime"
-  "inline"
-  "noinline"
-  "asm"
-  "callconv"
-  "noalias"
-] @keyword.directive
-
-[
-  (CompareOp)
-  (BitwiseOp)
-  (BitShiftOp)
-  (AdditionOp)
-  (AssignOp)
-  (MultiplyOp)
-  (PrefixOp)
-  "*"
-  "**"
-  "->"
-  ".?"
-  ".*"
-  "?"
-] @operator
-
-[
-  ";"
-  "."
-  ","
-  ":"
-] @punctuation.delimiter
-
-[
-  ".."
-  "..."
-] @punctuation.special
 
 [
   "["
@@ -223,9 +14,281 @@
   ")"
   "{"
   "}"
-  (Payload "|")
-  (PtrPayload "|")
-  (PtrIndexPayload "|")
 ] @punctuation.bracket
 
-(ERROR) @keyword.control.exception
+[
+  ";"
+  "."
+  ","
+  ":"
+  "=>"
+  "->"
+] @punctuation.delimiter
+
+(payload "|" @punctuation.bracket)
+
+; Literals
+
+(character) @constant.character
+
+([
+  (string)
+  (multiline_string)
+] @string
+  (#set! "priority" 95))
+
+(integer) @constant.numeric.integer
+
+(float) @constant.numeric.float
+
+(boolean) @constant.builtin.boolean
+
+(escape_sequence) @constant.character.escape
+
+; Operator
+
+[
+  "="
+  "*="
+  "*%="
+  "*|="
+  "/="
+  "%="
+  "+="
+  "+%="
+  "+|="
+  "-="
+  "-%="
+  "-|="
+  "<<="
+  "<<|="
+  ">>="
+  "&="
+  "^="
+  "|="
+  "!"
+  "~"
+  "-"
+  "-%"
+  "&"
+  "=="
+  "!="
+  ">"
+  ">="
+  "<="
+  "<"
+  "&"
+  "^"
+  "|"
+  "<<"
+  ">>"
+  "<<|"
+  "+"
+  "++"
+  "+%"
+  "-%"
+  "+|"
+  "-|"
+  "*"
+  "/"
+  "%"
+  "**"
+  "*%"
+  "*|"
+  "||"
+  ".*"
+  ".?"
+  "?"
+  ".."
+] @operator
+
+; Keywords
+
+[
+  "asm"
+  "test"
+] @keyword
+
+[
+  "error"
+  "const"
+  "var"
+  "struct"
+  "union"
+  "enum"
+  "opaque"
+] @keyword.storage.type
+
+; todo: keyword.coroutine
+[
+  "async"
+  "await"
+  "suspend"
+  "nosuspend"
+  "resume"
+] @keyword
+
+"fn" @keyword.function
+
+[
+  "and"
+  "or"
+  "orelse"
+] @keyword.operator
+
+[
+  "try"
+  "unreachable"
+  "return"
+] @keyword.control.return
+
+[
+  "if"
+  "else"
+  "switch"
+  "catch"
+] @keyword.control.conditional
+
+[
+  "for"
+  "while"
+  "break"
+  "continue"
+] @keyword.control.repeat
+
+[
+  "usingnamespace"
+  "export"
+] @keyword.control.import
+
+[
+  "defer"
+  "errdefer"
+] @keyword.control.exception
+
+[
+  "volatile"
+  "allowzero"
+  "noalias"
+  "addrspace"
+  "align"
+  "callconv"
+  "linksection"
+  "pub"
+  "inline"
+  "noinline"
+  "extern"
+  "comptime"
+  "packed"
+  "threadlocal"
+] @keyword.storage.modifier
+
+; Builtins
+
+[
+  "c"
+  "..."
+] @variable.builtin
+
+((identifier) @variable.builtin
+  (#eq? @variable.builtin "_"))
+
+(calling_convention
+  (identifier) @variable.builtin)
+
+; Modules
+
+(variable_declaration
+  (identifier) @variable ; TODO: module
+  (builtin_function
+    (builtin_identifier) @keyword.control.import
+    (#any-of? @keyword.control.import "@import" "@cImport")))
+
+; Functions
+
+(call_expression
+  function: (field_expression
+    member: (identifier) @function.method))
+
+(call_expression
+  function: (identifier) @function)
+
+(function_declaration
+  name: (identifier) @function)
+
+(builtin_identifier) @function.builtin
+
+; Fields
+
+(field_initializer
+  .
+  (identifier) @variable.other.member)
+
+(field_expression
+  (_)
+  member: (identifier) @variable.other.member)
+
+(container_field
+  name: (identifier) @variable.other.member)
+
+(initializer_list
+  (assignment_expression
+      left: (field_expression
+              .
+              member: (identifier) @variable.other.member)))
+
+; Labels
+
+(block_label (identifier) @label)
+
+(break_label (identifier) @label)
+
+; Constants
+
+((identifier) @constant
+  (#lua-match? @constant "^[A-Z][A-Z_0-9]+$"))
+
+[
+  "null"
+  "undefined"
+] @constant.builtin
+
+(field_expression
+  .
+  member: (identifier) @constant)
+
+(enum_declaration
+  (container_field
+    type: (identifier) @constant))
+
+; Types
+
+(parameter
+  type: (identifier) @type)
+
+((identifier) @type
+  (#lua-match? @type "^[A-Z_][a-zA-Z0-9_]*"))
+
+(variable_declaration
+  (identifier) @type
+  "="
+  [
+    (struct_declaration)
+    (enum_declaration)
+    (union_declaration)
+    (opaque_declaration)
+  ])
+
+[
+  (builtin_type)
+  "anyframe"
+] @type.builtin
+
+; Parameters
+
+(parameter
+  name: (identifier) @variable.parameter)
+
+; Variables
+
+(identifier) @variable

runtime/queries/zig/indents.scm

@@ -1,13 +1,7 @@
 [
-  (AsmExpr)
+  (block)
-  (AssignExpr)
+  (switch_expression)
-  (Block)
+  (initializer_list)
-  (BlockExpr)
-  (ContainerDecl)
-  (ErrorUnionExpr)
-  (InitList)
-  (SwitchExpr)
-  (TestDecl)
 ] @indent
 
 [

runtime/queries/zig/injections.scm

@@ -1,2 +1,2 @@
-([(line_comment) (doc_comment)] @injection.content
+((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))

runtime/queries/zig/textobjects.scm

@@ -1,23 +1,22 @@
-(Decl (FnProto)
+(function_declaration
-  (_) @function.inside) @function.around
+  body: (_) @function.inside) @function.around
 
-(TestDecl (_) @test.inside) @test.around
+(test_declaration (_) (block) @test.inside) @test.around
 
 ; matches all of: struct, enum, union
 ; this unfortunately cannot be split up because
 ; of the way struct "container" types are defined
-(Decl (VarDecl (ErrorUnionExpr (SuffixExpr (ContainerDecl
+(variable_declaration (identifier) (struct_declaration
-    (_) @class.inside))))) @class.around
+    (_) @class.inside)) @class.around
 
-(Decl (VarDecl (ErrorUnionExpr (SuffixExpr (ErrorSetDecl
+(variable_declaration (identifier) (enum_declaration
-    (_) @class.inside))))) @class.around
+    (_) @class.inside)) @class.around
 
-(ParamDeclList
+(variable_declaration (identifier) (enum_declaration
+    (_) @class.inside)) @class.around
+
+(parameters
   ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
 
-[
+(comment) @comment.inside
-  (doc_comment)
+(comment)+ @comment.around
-  (line_comment)
-] @comment.inside
-(line_comment)+ @comment.around
-(doc_comment)+ @comment.around