Skip to content

Commit 7a6ebce

Browse files
committed
fixed error with function parameters
1 parent 3476c17 commit 7a6ebce

File tree

4 files changed

+312
-296
lines changed

4 files changed

+312
-296
lines changed

Syntaxes/Zig.YAML-tmLanguage

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ repository:
2929
match: \\u\{[a-fA-F0-9]{1,6}\}
3030

3131
param_list:
32-
begin: '(?<=\(|,)\s*([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")\s*(:)\s*'
32+
begin: '([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")\s*(:)\s*'
3333
beginCaptures:
3434
'1':
3535
name: variable.parameter.zig
@@ -287,6 +287,7 @@ repository:
287287
name: storage.type.zig
288288

289289
patterns:
290+
- include: '#label'
290291
- include: '#param_list'
291292
- include: '#main'
292293

@@ -313,6 +314,7 @@ repository:
313314
name: storage.type.zig
314315

315316
patterns:
317+
- include: '#label'
316318
- include: '#param_list'
317319
- include: '#main'
318320

@@ -341,7 +343,7 @@ repository:
341343
name: storage.type.zig
342344

343345
enum_literal:
344-
match: '(?<!\w|\))(\.(?:[a-zA-Z_][a-zA-Z0-9_]*|@\".+\"))'
346+
match: '(?<!\w|\))(\.(?:[a-zA-Z_][a-zA-Z0-9_]*|@\".+\"))\b(?!\()'
345347
name: constant.language.enum
346348

347349
main:

Syntaxes/Zig.tmLanguage

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
<key>enum_literal</key>
240240
<dict>
241241
<key>match</key>
242-
<string>(?&lt;!\w|\))(\.(?:[a-zA-Z_][a-zA-Z0-9_]*|@\".+\"))</string>
242+
<string>(?&lt;!\w|\))(\.(?:[a-zA-Z_][a-zA-Z0-9_]*|@\".+\"))\b(?!\()</string>
243243
<key>name</key>
244244
<string>constant.language.enum</string>
245245
</dict>
@@ -324,6 +324,10 @@
324324
</dict>
325325
<key>patterns</key>
326326
<array>
327+
<dict>
328+
<key>include</key>
329+
<string>#label</string>
330+
</dict>
327331
<dict>
328332
<key>include</key>
329333
<string>#param_list</string>
@@ -371,6 +375,10 @@
371375
</dict>
372376
<key>patterns</key>
373377
<array>
378+
<dict>
379+
<key>include</key>
380+
<string>#label</string>
381+
</dict>
374382
<dict>
375383
<key>include</key>
376384
<string>#param_list</string>
@@ -575,7 +583,7 @@
575583
<key>param_list</key>
576584
<dict>
577585
<key>begin</key>
578-
<string>(?&lt;=\(|,)\s*([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")\s*(:)\s*</string>
586+
<string>([a-zA-Z_][a-zA-Z0-9_]*|@\".+\")\s*(:)\s*</string>
579587
<key>beginCaptures</key>
580588
<dict>
581589
<key>1</key>

0 commit comments

Comments
 (0)