From eb71d2f1a8a606ac467e56c8d22e2d46818f87cf Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Wed, 25 Sep 2024 10:03:10 +0200
Subject: [PATCH] zig: Fix highlighting of keywords like `orelse`, `or`, `and`
 (#18323)

This changes the Zig highlights.scm to tag all keywords with `@keyword`
and not with `@keyword.<subtype>`, so the highlighting works properly.

Closes #9355

Release Notes:

- N/A

Demo:

![screenshot-2024-09-25-09 32
20@2x](https://github.com/user-attachments/assets/567b8817-a522-4741-af7f-dcb1a79ddd40)
---
 extensions/zig/languages/zig/highlights.scm | 80 +++++++--------------
 1 file changed, 25 insertions(+), 55 deletions(-)

diff --git a/extensions/zig/languages/zig/highlights.scm b/extensions/zig/languages/zig/highlights.scm
index 152a66b670..aea2d34add 100644
--- a/extensions/zig/languages/zig/highlights.scm
+++ b/extensions/zig/languages/zig/highlights.scm
@@ -103,6 +103,7 @@ field_constant: (IDENTIFIER) @constant
 (BlockLabel (IDENTIFIER) @tag)
 
 [
+  "fn"
   "asm"
   "defer"
   "errdefer"
@@ -112,74 +113,21 @@ field_constant: (IDENTIFIER) @constant
   "enum"
   "opaque"
   "error"
-] @keyword
-
-[
-  "async"
-  "await"
-  "suspend"
-  "nosuspend"
-  "resume"
-] @keyword.coroutine
-
-[
-  "fn"
-] @keyword
-
-[
-  "and"
-  "or"
-  "orelse"
-] @operator
-
-[
-  "return"
-] @keyword.return
-
-[
-  "if"
-  "else"
-  "switch"
-] @keyword.control
-
-[
+  "try"
+  "catch"
   "for"
   "while"
   "break"
   "continue"
-] @keyword
-
-[
-  "usingnamespace"
-] @constant
-
-[
-  "try"
-  "catch"
-] @keyword
-
-[
-  "anytype"
-  "anyframe"
-  (BuildinTypeExpr)
-] @type
-
-[
   "const"
   "var"
   "volatile"
   "allowzero"
   "noalias"
-] @keyword
-
-[
   "addrspace"
   "align"
   "callconv"
   "linksection"
-] @keyword.storage
-
-[
   "comptime"
   "export"
   "extern"
@@ -188,8 +136,30 @@ field_constant: (IDENTIFIER) @constant
   "packed"
   "pub"
   "threadlocal"
+  "async"
+  "await"
+  "suspend"
+  "nosuspend"
+  "resume"
+  "and"
+  "or"
+  "orelse"
+  "return"
+  "if"
+  "else"
+  "switch"
 ] @keyword
 
+[
+  "usingnamespace"
+] @constant
+
+[
+  "anytype"
+  "anyframe"
+  (BuildinTypeExpr)
+] @type
+
 [
   "null"
   "unreachable"