From ebbfff5ce8329ba83af88c1bbf0e29f820fb3797 Mon Sep 17 00:00:00 2001
From: Allan Calix <contact@acx.dev>
Date: Thu, 25 Jan 2024 19:17:18 -0800
Subject: [PATCH] Updates zigs highlight to emit right captures

---
 crates/zed/src/languages/zig/highlights.scm | 18 +++++++++---------
 crates/zed/src/languages/zig/indents.scm    |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/crates/zed/src/languages/zig/highlights.scm b/crates/zed/src/languages/zig/highlights.scm
index 189d6aa468..62bb548401 100644
--- a/crates/zed/src/languages/zig/highlights.scm
+++ b/crates/zed/src/languages/zig/highlights.scm
@@ -25,6 +25,7 @@ parameter: (IDENTIFIER) @parameter
   ] @type
   (#match? @type "^[A-Z]([a-z]+[A-Za-z0-9]*)*$")
 )
+
 ;; assume camelCase is a function
 (
   [
@@ -32,7 +33,7 @@ parameter: (IDENTIFIER) @parameter
     field_access: (IDENTIFIER)
     parameter: (IDENTIFIER)
   ] @function
-  (#match? @function "^[a-z]+([A-Z][a-z0-9]*)+$")
+  (#match? @function "^[a-z]+([A-Z][a-z0-9]+)$")
 )
 
 ;; assume all CAPS_1 is a constant
@@ -49,7 +50,7 @@ parameter: (IDENTIFIER) @parameter
   function: (IDENTIFIER)
 ] @function
 
-exception: "!" @exception
+exception: "!" @keyword.exception
 
 (
   (IDENTIFIER) @variable.builtin
@@ -72,13 +73,12 @@ field_constant: (IDENTIFIER) @constant
 
 (BUILTINIDENTIFIER) @keyword
 
-; No idea why this doesnt work
-; ((BUILTINIDENTIFIER) @include
-;   (#any-of? @include "@import" "@cImport"))
+((BUILTINIDENTIFIER) @keyword.import
+  (#any-of? @keyword.import "@import" "@cImport"))
 
 (INTEGER) @number
 
-(FLOAT) @float
+(FLOAT) @number.float
 
 [
   "true"
@@ -135,7 +135,7 @@ field_constant: (IDENTIFIER) @constant
   "if"
   "else"
   "switch"
-] @conditional
+] @keyword
 
 [
   "for"
@@ -146,7 +146,7 @@ field_constant: (IDENTIFIER) @constant
 
 [
   "usingnamespace"
-] @include
+] @keyword.import
 
 [
   "try"
@@ -171,7 +171,7 @@ field_constant: (IDENTIFIER) @constant
   "align"
   "callconv"
   "linksection"
-] @storageclass
+] @keyword.storage
 
 [
   "comptime"
diff --git a/crates/zed/src/languages/zig/indents.scm b/crates/zed/src/languages/zig/indents.scm
index a2af44ee40..9c27ddcba3 100644
--- a/crates/zed/src/languages/zig/indents.scm
+++ b/crates/zed/src/languages/zig/indents.scm
@@ -3,7 +3,7 @@
   (ContainerDecl)
   (SwitchExpr)
   (InitList)
-] @indent
+] @indent.begin
 
 [
   "("
@@ -12,11 +12,11 @@
   "]"
   "{"
   "}"
-] @branch
+] @indent.branch
 
 [
   (line_comment)
   (container_doc_comment)
   (doc_comment)
   (LINESTRING)
-] @ignore
+] @indent.ignore