From f76737ee334ff2ddf7d2ab8f5fe1c01db080822b Mon Sep 17 00:00:00 2001
From: maxxnino <idonthaveemail@dontknow.com>
Date: Mon, 20 Sep 2021 17:58:15 +0900
Subject: Zig queries: highlight, fold and indent  * fold for if/while/for  *
 highlight "_" for ignore variable  * highlight "c" for PtrTypeStart  *
 highlight "?" for optional type  * remove duplicate query node in indent

---
 queries/zig/folds.scm      |  7 +++++++
 queries/zig/highlights.scm | 14 ++++++++++----
 queries/zig/indents.scm    |  1 -
 3 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'queries/zig')

diff --git a/queries/zig/folds.scm b/queries/zig/folds.scm
index 5fa6eb974..965987439 100644
--- a/queries/zig/folds.scm
+++ b/queries/zig/folds.scm
@@ -6,4 +6,11 @@
   (AsmExpr)
   (ErrorSetDecl)
   (LINESTRING)
+  (
+    [
+      (IfPrefix)
+      (WhilePrefix)
+      (ForPrefix)
+    ]
+  )
 ] @fold
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index 24c41d6d3..6678cc017 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -23,7 +23,7 @@ parameter: (IDENTIFIER) @parameter
     field_access: (IDENTIFIER)
     parameter: (IDENTIFIER)
   ] @type
-  (#match? @type "^[A-Z]([a-z0-9]+[A-Za-z0-9]*)*$")
+  (#match? @type "^[A-Z]([a-z]+[A-Za-z0-9]*)*$")
 )
 ;; assume camelCase is a function
 (
@@ -51,6 +51,13 @@ parameter: (IDENTIFIER) @parameter
 
 exception: "!" @exception
 
+(
+  (IDENTIFIER) @variable.builtin
+  (#eq? @variable.builtin "_")
+)
+
+(PtrTypeStart "c" @variable.builtin)
+
 (
   (ContainerDeclType
     [
@@ -58,9 +65,7 @@ exception: "!" @exception
       "enum"
     ]
   )
-  (ContainerMembers
-    (ContainerField (IDENTIFIER) @constant)
-  )
+  (ContainerField (IDENTIFIER) @constant)
 )
 
 field_constant: (IDENTIFIER) @constant
@@ -199,6 +204,7 @@ field_constant: (IDENTIFIER) @constant
   ".?"
   ".*"
   "="
+  "?"
 ] @operator
 
 [
diff --git a/queries/zig/indents.scm b/queries/zig/indents.scm
index 54fe29312..a2af44ee4 100644
--- a/queries/zig/indents.scm
+++ b/queries/zig/indents.scm
@@ -3,7 +3,6 @@
   (ContainerDecl)
   (SwitchExpr)
   (InitList)
-  (ContainerDecl)
 ] @indent
 
 [
-- 
cgit v1.2.3-70-g09d2