added highlighting for function return-types

removed meta.function.parameter and meta.block scopes due to issues
with the end of the scopes being detected improperly

Author: emekoi

Syntaxes/Zig.YAML-tmLanguage

@@ -36,13 +36,14 @@ repository:
       '2':
         name: punctuation.separator.zig
 
-    end: '([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")(?:(,)|(?=\)))'
-
+    end: '([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")?\s*(?:(,)|(\)))'
     endCaptures:
       '1':
         name: storage.type.zig
       '2':
         name: punctuation.separator.zig
+      '3':
+        name: punctuation.section.parens.end.zig
 
     patterns:
       - include: '#main'
@@ -263,8 +264,6 @@ repository:
       '2':
         name: punctuation.section.braces.begin.zig
 
-    contentName: meta.block.zig
-
     end: '(\})'
     endCaptures:
       '1':
@@ -281,17 +280,18 @@ repository:
       '2':
         name: punctuation.section.parens.begin.zig
 
-    contentName: meta.function.parameters.zig
-
-    end: '(\))'
+    end: '(?<=\))([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")'
     endCaptures:
       '1':
-        name: punctuation.section.parens.begin.zig
+        name: storage.type.zig
 
     patterns:
       - include: '#param_list'
       - include: '#main'
 
+      - match: '([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")'
+        name: storage.type.zig
+
   function_call:
     name: variable.function.zig
     match: '(?<!fn)\b([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")(?=\s*\()'
@@ -304,17 +304,20 @@ repository:
       '2':
         name: punctuation.section.parens.begin.zig
 
-    contentName: meta.parameters.zig
+    contentName: meta.function.parameters.zig
 
-    end: '(\))'
+    end: '(?<=\))\s*([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")'
     endCaptures:
       '1':
-        name: punctuation.section.parens.end.zig
+        name: storage.type.zig
 
     patterns:
       - include: '#param_list'
       - include: '#main'
 
+      - match: '([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")'
+        name: storage.type.zig
+
   var_decl:
     begin: '\b(const|var)\s+([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")\s*(:)'
     beginCaptures:
@@ -354,5 +357,5 @@ repository:
       - include: '#support'
       - include: '#field_decl'
       - include: '#block'
-      - include: '#function_call'
       - include: '#function_def'
+      - include: '#function_call'

Syntaxes/Zig.tmLanguage

@@ -34,8 +34,6 @@
 					<string>punctuation.section.braces.begin.zig</string>
 				</dict>
 			</dict>
-			<key>contentName</key>
-			<string>meta.block.zig</string>
 			<key>end</key>
 			<string>(\})</string>
 			<key>endCaptures</key>
@@ -312,16 +310,14 @@
 					<string>punctuation.section.parens.begin.zig</string>
 				</dict>
 			</dict>
-			<key>contentName</key>
-			<string>meta.function.parameters.zig</string>
 			<key>end</key>
-			<string>(\))</string>
+			<string>(?&lt;=\))([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")</string>
 			<key>endCaptures</key>
 			<dict>
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.section.parens.begin.zig</string>
+					<string>storage.type.zig</string>
 				</dict>
 			</dict>
 			<key>patterns</key>
@@ -334,6 +330,12 @@
 					<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>
 			</array>
 		</dict>
 		<key>function_type</key>
@@ -354,15 +356,15 @@
 				</dict>
 			</dict>
 			<key>contentName</key>
-			<string>meta.parameters.zig</string>
+			<string>meta.function.parameters.zig</string>
 			<key>end</key>
-			<string>(\))</string>
+			<string>(?&lt;=\))\s*([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")</string>
 			<key>endCaptures</key>
 			<dict>
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.section.parens.end.zig</string>
+					<string>storage.type.zig</string>
 				</dict>
 			</dict>
 			<key>patterns</key>
@@ -375,6 +377,12 @@
 					<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>
 			</array>
 		</dict>
 		<key>keywords</key>
@@ -506,11 +514,11 @@
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#function_call</string>
+					<string>#function_def</string>
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#function_def</string>
+					<string>#function_call</string>
 				</dict>
 			</array>
 		</dict>
@@ -580,7 +588,7 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")(?:(,)|(?=\)))</string>
+			<string>([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")?\s*(?:(,)|(\)))</string>
 			<key>endCaptures</key>
 			<dict>
 				<key>1</key>
@@ -593,6 +601,11 @@
 					<key>name</key>
 					<string>punctuation.separator.zig</string>
 				</dict>
+				<key>3</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.section.parens.end.zig</string>
+				</dict>
 			</dict>
 			<key>patterns</key>
 			<array>