Skip to content

Commit 10f29f5

Browse files
sheetalkamatsheetalkamat
committed
Fix scope names for ',' punctuation
1 parent 6e4b81f commit 10f29f5

10 files changed

+52
-77
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ repository:
108108
match: ([_$[:alpha:]][_$[:alnum:]]*)
109109
- name: variable.other.readwrite.ts
110110
match: ([_$[:alpha:]][_$[:alnum:]]*)
111-
- name: meta.delimiter.object.comma.ts
112-
match: ','
111+
- include: '#punctuation-comma'
113112

114113
array-binding-element:
115114
patterns:
@@ -118,8 +117,7 @@ repository:
118117
- include: '#array-binding-pattern'
119118
- name: variable.other.readwrite.ts
120119
match: ([_$[:alpha:]][_$[:alnum:]]*)
121-
- name: meta.delimiter.object.comma.ts
122-
match: ','
120+
- include: '#punctuation-comma'
123121

124122
object-binding-pattern:
125123
begin: \{
@@ -371,8 +369,7 @@ repository:
371369
'4': { name: keyword.control.as.ts }
372370
'5': { name: invalid.illegal.ts }
373371
'6': { name: variable.other.readwrite.alias.ts }
374-
- name: meta.delimiter.object.comma.ts
375-
match: ','
372+
- include: '#punctuation-comma'
376373
- name: constant.language.import-export-all.ts
377374
match: \*
378375
- name: keyword.control.default.ts
@@ -652,8 +649,7 @@ repository:
652649
match: ([_$[:alpha:]][_$[:alnum:]]*)
653650
- name: variable.parameter.ts
654651
match: ([_$[:alpha:]][_$[:alnum:]]*)
655-
- name: meta.delimiter.object.comma.ts
656-
match: ','
652+
- include: '#punctuation-comma'
657653

658654
parameter-array-binding-element:
659655
patterns:
@@ -662,8 +658,7 @@ repository:
662658
- include: '#parameter-array-binding-pattern'
663659
- name: variable.parameter.ts
664660
match: ([_$[:alpha:]][_$[:alnum:]]*)
665-
- name: meta.delimiter.object.comma.ts
666-
match: ','
661+
- include: '#punctuation-comma'
667662

668663
parameter-object-binding-pattern:
669664
begin: \{

‎TypeScript.tmLanguage

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -344,10 +344,8 @@
344344
<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
345345
</dict>
346346
<dict>
347-
<key>name</key>
348-
<string>meta.delimiter.object.comma.ts</string>
349-
<key>match</key>
350-
<string>,</string>
347+
<key>include</key>
348+
<string>#punctuation-comma</string>
351349
</dict>
352350
</array>
353351
</dict>
@@ -374,10 +372,8 @@
374372
<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
375373
</dict>
376374
<dict>
377-
<key>name</key>
378-
<string>meta.delimiter.object.comma.ts</string>
379-
<key>match</key>
380-
<string>,</string>
375+
<key>include</key>
376+
<string>#punctuation-comma</string>
381377
</dict>
382378
</array>
383379
</dict>
@@ -1202,10 +1198,8 @@
12021198
</dict>
12031199
</dict>
12041200
<dict>
1205-
<key>name</key>
1206-
<string>meta.delimiter.object.comma.ts</string>
1207-
<key>match</key>
1208-
<string>,</string>
1201+
<key>include</key>
1202+
<string>#punctuation-comma</string>
12091203
</dict>
12101204
<dict>
12111205
<key>name</key>
@@ -2133,10 +2127,8 @@
21332127
<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
21342128
</dict>
21352129
<dict>
2136-
<key>name</key>
2137-
<string>meta.delimiter.object.comma.ts</string>
2138-
<key>match</key>
2139-
<string>,</string>
2130+
<key>include</key>
2131+
<string>#punctuation-comma</string>
21402132
</dict>
21412133
</array>
21422134
</dict>
@@ -2163,10 +2155,8 @@
21632155
<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
21642156
</dict>
21652157
<dict>
2166-
<key>name</key>
2167-
<string>meta.delimiter.object.comma.ts</string>
2168-
<key>match</key>
2169-
<string>,</string>
2158+
<key>include</key>
2159+
<string>#punctuation-comma</string>
21702160
</dict>
21712161
</array>
21722162
</dict>

‎TypeScriptReact.tmLanguage

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -344,10 +344,8 @@
344344
<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
345345
</dict>
346346
<dict>
347-
<key>name</key>
348-
<string>meta.delimiter.object.comma.tsx</string>
349-
<key>match</key>
350-
<string>,</string>
347+
<key>include</key>
348+
<string>#punctuation-comma</string>
351349
</dict>
352350
</array>
353351
</dict>
@@ -374,10 +372,8 @@
374372
<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
375373
</dict>
376374
<dict>
377-
<key>name</key>
378-
<string>meta.delimiter.object.comma.tsx</string>
379-
<key>match</key>
380-
<string>,</string>
375+
<key>include</key>
376+
<string>#punctuation-comma</string>
381377
</dict>
382378
</array>
383379
</dict>
@@ -1206,10 +1202,8 @@
12061202
</dict>
12071203
</dict>
12081204
<dict>
1209-
<key>name</key>
1210-
<string>meta.delimiter.object.comma.tsx</string>
1211-
<key>match</key>
1212-
<string>,</string>
1205+
<key>include</key>
1206+
<string>#punctuation-comma</string>
12131207
</dict>
12141208
<dict>
12151209
<key>name</key>
@@ -2137,10 +2131,8 @@
21372131
<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
21382132
</dict>
21392133
<dict>
2140-
<key>name</key>
2141-
<string>meta.delimiter.object.comma.tsx</string>
2142-
<key>match</key>
2143-
<string>,</string>
2134+
<key>include</key>
2135+
<string>#punctuation-comma</string>
21442136
</dict>
21452137
</array>
21462138
</dict>
@@ -2167,10 +2159,8 @@
21672159
<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
21682160
</dict>
21692161
<dict>
2170-
<key>name</key>
2171-
<string>meta.delimiter.object.comma.tsx</string>
2172-
<key>match</key>
2173-
<string>,</string>
2162+
<key>include</key>
2163+
<string>#punctuation-comma</string>
21742164
</dict>
21752165
</array>
21762166
</dict>

‎tests/baselines/Issue143.baseline.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ Grammar: TypeScript.tmLanguage
3131
^^^^^^^^^
3232
source.ts meta.import.ts meta.block.ts variable.other.readwrite.alias.ts
3333
^
34-
source.ts meta.import.ts meta.block.ts meta.delimiter.object.comma.ts
34+
source.ts meta.import.ts meta.block.ts punctuation.separator.comma.ts
3535
^
3636
source.ts meta.import.ts meta.block.ts
3737
^^^^^^^^^^^^
3838
source.ts meta.import.ts meta.block.ts variable.other.readwrite.alias.ts
3939
^
40-
source.ts meta.import.ts meta.block.ts meta.delimiter.object.comma.ts
40+
source.ts meta.import.ts meta.block.ts punctuation.separator.comma.ts
4141
^
4242
source.ts meta.import.ts meta.block.ts
4343
^^^^^^^^^

‎tests/baselines/Issue153.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Grammar: TypeScript.tmLanguage
7171
^^^^^^^
7272
source.ts meta.import.ts meta.block.ts variable.other.readwrite.alias.ts
7373
^
74-
source.ts meta.import.ts meta.block.ts meta.delimiter.object.comma.ts
74+
source.ts meta.import.ts meta.block.ts punctuation.separator.comma.ts
7575
^
7676
source.ts meta.import.ts meta.block.ts
7777
^^^^^^

‎tests/baselines/Issue219.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Grammar: TypeScript.tmLanguage
2525
^^^
2626
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
2727
^
28-
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.delimiter.object.comma.ts
28+
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.separator.comma.ts
2929
^^^
3030
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
3131
> coordinate

‎tests/baselines/Issue232.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Grammar: TypeScript.tmLanguage
2323
^
2424
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts
2525
^
26-
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.delimiter.object.comma.ts
26+
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.separator.comma.ts
2727
^
2828
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts
2929
^^^^^^^^^

‎tests/baselines/exportDeclarations.baseline.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Grammar: TypeScript.tmLanguage
2727
^
2828
source.ts meta.export.ts meta.block.ts variable.other.readwrite.alias.ts
2929
^
30-
source.ts meta.export.ts meta.block.ts meta.delimiter.object.comma.ts
30+
source.ts meta.export.ts meta.block.ts punctuation.separator.comma.ts
3131
^
3232
source.ts meta.export.ts meta.block.ts
3333
^
@@ -83,7 +83,7 @@ Grammar: TypeScript.tmLanguage
8383
^
8484
source.ts meta.export.ts meta.block.ts variable.other.readwrite.alias.ts
8585
^
86-
source.ts meta.export.ts meta.block.ts meta.delimiter.object.comma.ts
86+
source.ts meta.export.ts meta.block.ts punctuation.separator.comma.ts
8787
^
8888
source.ts meta.export.ts meta.block.ts
8989
^

‎tests/baselines/parameterBindingPattern.baseline.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ Grammar: TypeScript.tmLanguage
293293
^
294294
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts
295295
^
296-
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts
296+
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.separator.comma.ts
297297
^
298298
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts
299299
^
@@ -317,7 +317,7 @@ Grammar: TypeScript.tmLanguage
317317
^
318318
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts
319319
^
320-
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts
320+
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.separator.comma.ts
321321
^
322322
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts
323323
^
@@ -331,7 +331,7 @@ Grammar: TypeScript.tmLanguage
331331
^
332332
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts
333333
^
334-
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts
334+
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.separator.comma.ts
335335
^
336336
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts
337337
^
@@ -347,7 +347,7 @@ Grammar: TypeScript.tmLanguage
347347
^
348348
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.array.ts
349349
^
350-
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts
350+
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.separator.comma.ts
351351
^
352352
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts
353353
^
@@ -401,7 +401,7 @@ Grammar: TypeScript.tmLanguage
401401
^
402402
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts
403403
^
404-
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts
404+
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.separator.comma.ts
405405
^
406406
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts
407407
^
@@ -425,7 +425,7 @@ Grammar: TypeScript.tmLanguage
425425
^
426426
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts
427427
^
428-
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts
428+
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.separator.comma.ts
429429
^
430430
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts
431431
^
@@ -439,7 +439,7 @@ Grammar: TypeScript.tmLanguage
439439
^
440440
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts
441441
^
442-
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts
442+
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.separator.comma.ts
443443
^
444444
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts
445445
^
@@ -455,7 +455,7 @@ Grammar: TypeScript.tmLanguage
455455
^
456456
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.array.ts
457457
^
458-
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts
458+
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.separator.comma.ts
459459
^
460460
source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts
461461
^
@@ -770,7 +770,7 @@ Grammar: TypeScript.tmLanguage
770770
^
771771
source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.object.ts
772772
^
773-
source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts meta.delimiter.object.comma.ts
773+
source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts punctuation.separator.comma.ts
774774
^
775775
source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts
776776
^^^^^
@@ -820,7 +820,7 @@ Grammar: TypeScript.tmLanguage
820820
^
821821
source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.object.ts
822822
^
823-
source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts meta.delimiter.object.comma.ts
823+
source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts punctuation.separator.comma.ts
824824
^
825825
source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts
826826
^^^^^

0 commit comments

Comments
 (0)