fixed issue with function return types

Author: emekoi

Syntaxes/Zig.YAML-tmLanguage

@@ -29,7 +29,7 @@ repository:
         match: \\u\{[a-fA-F0-9]{1,6}\}
 
   param_list:
-    begin: '([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")\s*(:)\s*'
+    begin: '(?<=\(|,)\s*([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")\s*(:)\s*'
     beginCaptures:
       '1':
         name: variable.parameter.zig
@@ -46,11 +46,11 @@ repository:
         name: punctuation.section.parens.end.zig
 
     patterns:
+      - include: '#main'
+
       - match: '([a-zA-Z_][a-zA-Z0-9_.]*|@\".+\")'
         name: storage.type.zig
 
-      - include: '#main'
-
   field_decl:
     begin: '([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")\s*(:)\s*'
     beginCaptures:
@@ -290,7 +290,7 @@ repository:
       - include: '#param_list'
       - include: '#main'
 
-      - match: '([a-zA-Z_][a-zA-Z0-9_.]*|@\".+\")'
+      - match: '([a-zA-Z_][a-zA-Z0-9_.]*|@\".+\")(?=;)'
         name: storage.type.zig
 
   function_call:
@@ -346,10 +346,9 @@ repository:
 
   main:
     patterns:
-      - include: '#field_decl'
+      - include: '#label'
       - include: '#function_type'
       - include: '#var_decl'
-      - include: '#label'
       - include: '#punctuation'
       - include: '#storage_modifier'
       - include: '#container_decl'

Syntaxes/Zig.tmLanguage

@@ -334,7 +334,7 @@
 				</dict>
 				<dict>
 					<key>match</key>
-					<string>([a-zA-Z_][a-zA-Z0-9_.]*|@\".+\")</string>
+					<string>([a-zA-Z_][a-zA-Z0-9_.]*|@\".+\")(?=;)</string>
 					<key>name</key>
 					<string>storage.type.zig</string>
 				</dict>
@@ -452,7 +452,7 @@
 			<array>
 				<dict>
 					<key>include</key>
-					<string>#field_decl</string>
+					<string>#label</string>
 				</dict>
 				<dict>
 					<key>include</key>
@@ -462,10 +462,6 @@
 					<key>include</key>
 					<string>#var_decl</string>
 				</dict>
-				<dict>
-					<key>include</key>
-					<string>#label</string>
-				</dict>
 				<dict>
 					<key>include</key>
 					<string>#punctuation</string>
@@ -579,7 +575,7 @@
 		<key>param_list</key>
 		<dict>
 			<key>begin</key>
-			<string>([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")\s*(:)\s*</string>
+			<string>(?&lt;=\(|,)\s*([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")\s*(:)\s*</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -615,16 +611,16 @@
 			</dict>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#main</string>
+				</dict>
 				<dict>
 					<key>match</key>
 					<string>([a-zA-Z_][a-zA-Z0-9_.]*|@\".+\")</string>
 					<key>name</key>
 					<string>storage.type.zig</string>
 				</dict>
-				<dict>
-					<key>include</key>
-					<string>#main</string>
-				</dict>
 			</array>
 		</dict>
 		<key>punctuation</key>