Skip to content

Commit 2daf70a

Browse files
committed
Add scope name for ':' punctuation of case/default clause
1 parent 817281c commit 2daf70a

8 files changed

+63
-45
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -929,6 +929,8 @@ repository:
929929
beginCaptures:
930930
'1': { name: keyword.control.switch.ts }
931931
end: ':'
932+
endCaptures:
933+
'0': { name: punctuation.definition.section.case-statement.ts }
932934
patterns:
933935
- include: '#expression'
934936

TypeScript.tmLanguage

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2900,6 +2900,14 @@
29002900
</dict>
29012901
<key>end</key>
29022902
<string>:</string>
2903+
<key>endCaptures</key>
2904+
<dict>
2905+
<key>0</key>
2906+
<dict>
2907+
<key>name</key>
2908+
<string>punctuation.definition.section.case-statement.ts</string>
2909+
</dict>
2910+
</dict>
29032911
<key>patterns</key>
29042912
<array>
29052913
<dict>

TypeScriptReact.tmLanguage

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2904,6 +2904,14 @@
29042904
</dict>
29052905
<key>end</key>
29062906
<string>:</string>
2907+
<key>endCaptures</key>
2908+
<dict>
2909+
<key>0</key>
2910+
<dict>
2911+
<key>name</key>
2912+
<string>punctuation.definition.section.case-statement.tsx</string>
2913+
</dict>
2914+
</dict>
29072915
<key>patterns</key>
29082916
<array>
29092917
<dict>

tests/baselines/Issue243.baseline.txt

Lines changed: 33 additions & 33 deletions
Large diffs are not rendered by default.

tests/baselines/Issue294.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Grammar: TypeScript.tmLanguage
3737
^
3838
source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
3939
^
40-
source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
40+
source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts punctuation.definition.section.case-statement.ts
4141
^
4242
source.ts switch-statement.expr.ts switch-block.expr.ts
4343
^

tests/baselines/Issue335.baseline.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ Grammar: TypeScript.tmLanguage
322322
^
323323
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
324324
^
325-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
325+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts punctuation.definition.section.case-statement.ts
326326
> case 2:
327327
^^^
328328
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
@@ -333,14 +333,14 @@ Grammar: TypeScript.tmLanguage
333333
^
334334
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
335335
^
336-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
336+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts punctuation.definition.section.case-statement.ts
337337
> default:
338338
^^^
339339
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
340340
^^^^^^^
341341
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
342342
^
343-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
343+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts punctuation.definition.section.case-statement.ts
344344
> break;
345345
^^^^
346346
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
@@ -474,7 +474,7 @@ Grammar: TypeScript.tmLanguage
474474
^
475475
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
476476
^
477-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
477+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts punctuation.definition.section.case-statement.ts
478478
> case 2:
479479
^^^
480480
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
@@ -485,14 +485,14 @@ Grammar: TypeScript.tmLanguage
485485
^
486486
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
487487
^
488-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
488+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts punctuation.definition.section.case-statement.ts
489489
> default:
490490
^^^
491491
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
492492
^^^^^^^
493493
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
494494
^
495-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
495+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts punctuation.definition.section.case-statement.ts
496496
> break;
497497
^^^^
498498
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts

tests/baselines/Issue37.baseline.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ Grammar: TypeScript.tmLanguage
325325
^
326326
source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
327327
^
328-
source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
328+
source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts punctuation.definition.section.case-statement.ts
329329
^
330330
source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
331331
^^^^^
@@ -342,7 +342,7 @@ Grammar: TypeScript.tmLanguage
342342
^
343343
source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
344344
^
345-
source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
345+
source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts punctuation.definition.section.case-statement.ts
346346
^
347347
source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
348348
^^^^^
@@ -355,7 +355,7 @@ Grammar: TypeScript.tmLanguage
355355
^^^^^^^
356356
source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
357357
^
358-
source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
358+
source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts punctuation.definition.section.case-statement.ts
359359
^
360360
source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
361361
^^^^^

tests/baselines/javascript.baseline.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Grammar: TypeScript.tmLanguage
3939
^
4040
source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
4141
^
42-
source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
42+
source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts punctuation.definition.section.case-statement.ts
4343
^^
4444
source.ts switch-statement.expr.ts switch-block.expr.ts
4545
> default:
@@ -48,7 +48,7 @@ Grammar: TypeScript.tmLanguage
4848
^^^^^^^
4949
source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
5050
^
51-
source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
51+
source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts punctuation.definition.section.case-statement.ts
5252
^^
5353
source.ts switch-statement.expr.ts switch-block.expr.ts
5454
>}

0 commit comments

Comments
 (0)