improved anyframe type highlighting

ziglang · Oct 17, 2019 · 8265708 · 8265708
1 parent fd2373b
commit 8265708
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 3 deletions.
diff --git a/Syntaxes/Zig.YAML-tmLanguage b/Syntaxes/Zig.YAML-tmLanguage
@@ -205,7 +205,7 @@ repository:
   storage:
     patterns:
       - name: storage.type.zig
-        match: '\b(bool|void|noreturn|type|anyerror|anyframe)\b'
+        match: '\b(bool|void|noreturn|type|anyerror)\b'
 
       - name: storage.type.integer.zig
         match: '\b(?<!\.)([iu][0-9]\d*|[iu]size|comptime_int)\b'
@@ -216,6 +216,15 @@ repository:
       - 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'
 
+      - match: '\b(anyframe)\b\s*(->)?\s*(?:([a-zA-Z_][a-zA-Z0-9_.]*|@\".+\")\b(?!\s*\())?'
+        captures: 
+          '1':
+            name: storage.type.zig
+          '2':
+            name: keyword.operator.zig
+          '3':
+            name: storage.type.zig
+
       - name: storage.type.function.zig
         match: '\bfn\b'
 

diff --git a/Syntaxes/Zig.tmLanguage b/Syntaxes/Zig.tmLanguage
@@ -687,7 +687,7 @@
 			<array>
 				<dict>
 					<key>match</key>
-					<string>\b(bool|void|noreturn|type|anyerror|anyframe)\b</string>
+					<string>\b(bool|void|noreturn|type|anyerror)\b</string>
 					<key>name</key>
 					<string>storage.type.zig</string>
 				</dict>
@@ -709,6 +709,28 @@
 					<key>name</key>
 					<string>storage.type.c_compat.zig</string>
 				</dict>
+				<dict>
+					<key>captures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>storage.type.zig</string>
+						</dict>
+						<key>2</key>
+						<dict>
+							<key>name</key>
+							<string>keyword.operator.zig</string>
+						</dict>
+						<key>3</key>
+						<dict>
+							<key>name</key>
+							<string>storage.type.zig</string>
+						</dict>
+					</dict>
+					<key>match</key>
+					<string>\b(anyframe)\b\s*(-&gt;)?\s*(?:([a-zA-Z_][a-zA-Z0-9_.]*|@\".+\")\b(?!\s*\())?</string>
+				</dict>
 				<dict>
 					<key>match</key>
 					<string>\bfn\b</string>

diff --git a/Syntaxes/Zig.tmLanguage.json b/Syntaxes/Zig.tmLanguage.json
@@ -385,7 +385,7 @@
         "storage": {
             "patterns": [
                 {
-                    "match": "\\b(bool|void|noreturn|type|anyerror|anyframe)\\b", 
+                    "match": "\\b(bool|void|noreturn|type|anyerror)\\b", 
                     "name": "storage.type.zig"
                 }, 
                 {
@@ -400,6 +400,20 @@
                     "match": "\\b(c_short|c_ushort|c_int|c_uint|c_long|c_ulong|c_longlong|c_ulonglong|c_longdouble|c_void)\\b", 
                     "name": "storage.type.c_compat.zig"
                 }, 
+                {
+                    "match": "\\b(anyframe)\\b\\s*(->)?\\s*(?:([a-zA-Z_][a-zA-Z0-9_.]*|@\\\".+\\\")\\b(?!\\s*\\())?", 
+                    "captures": {
+                        "1": {
+                            "name": "storage.type.zig"
+                        }, 
+                        "3": {
+                            "name": "storage.type.zig"
+                        }, 
+                        "2": {
+                            "name": "keyword.operator.zig"
+                        }
+                    }
+                }, 
                 {
                     "match": "\\bfn\\b", 
                     "name": "storage.type.function.zig"