Skip to content

Commit 8170e06

Browse files
sheetalkamatsheetalkamat
committed
Scope ';'
1 parent 87aa92a commit 8170e06

File tree

99 files changed

+1685
-849
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+1685
-849
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ repository:
2424
- include: '#control-statement'
2525
# add label
2626
- include: '#expression'
27+
- include: '#punctuation-semicolon'
2728

2829
var-expr:
2930
name: meta.var.expr.ts
@@ -433,6 +434,8 @@ repository:
433434
- include: '#access-modifier'
434435
- include: '#static-modifier'
435436
- include: '#property-accessor'
437+
- include: '#punctuation-comma'
438+
- include: '#punctuation-semicolon'
436439

437440
type-object:
438441
name: meta.object.type.ts
@@ -453,6 +456,7 @@ repository:
453456
- include: '#indexer-declaration'
454457
- include: '#type-annotation'
455458
- include: '#punctuation-comma'
459+
- include: '#punctuation-semicolon'
456460

457461
field-declaration:
458462
name: meta.field.declaration.ts
@@ -847,6 +851,7 @@ repository:
847851
patterns:
848852
- include: '#var-expr'
849853
- include: '#expression'
854+
- include: '#punctuation-semicolon'
850855

851856
switch-expression:
852857
name: switch-expression.expr.ts
@@ -1074,6 +1079,10 @@ repository:
10741079
name: punctuation.separator.comma.ts
10751080
match: ','
10761081

1082+
punctuation-semicolon:
1083+
name: punctuation.terminator.statement.ts
1084+
match: ';'
1085+
10771086
paren-expression:
10781087
begin: \(
10791088
beginCaptures:

‎TypeScript.tmLanguage

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,14 @@
407407
<key>include</key>
408408
<string>#property-accessor</string>
409409
</dict>
410+
<dict>
411+
<key>include</key>
412+
<string>#punctuation-comma</string>
413+
</dict>
414+
<dict>
415+
<key>include</key>
416+
<string>#punctuation-semicolon</string>
417+
</dict>
410418
</array>
411419
</dict>
412420
<key>class-or-interface-declaration</key>
@@ -1397,6 +1405,10 @@
13971405
<key>include</key>
13981406
<string>#expression</string>
13991407
</dict>
1408+
<dict>
1409+
<key>include</key>
1410+
<string>#punctuation-semicolon</string>
1411+
</dict>
14001412
</array>
14011413
</dict>
14021414
<key>function-call</key>
@@ -2879,6 +2891,13 @@
28792891
<key>name</key>
28802892
<string>punctuation.separator.comma.ts</string>
28812893
</dict>
2894+
<key>punctuation-semicolon</key>
2895+
<dict>
2896+
<key>match</key>
2897+
<string>;</string>
2898+
<key>name</key>
2899+
<string>punctuation.terminator.statement.ts</string>
2900+
</dict>
28822901
<key>qstring-double</key>
28832902
<dict>
28842903
<key>begin</key>
@@ -3318,6 +3337,10 @@
33183337
<key>include</key>
33193338
<string>#expression</string>
33203339
</dict>
3340+
<dict>
3341+
<key>include</key>
3342+
<string>#punctuation-semicolon</string>
3343+
</dict>
33213344
</array>
33223345
</dict>
33233346
<key>static-modifier</key>
@@ -3861,6 +3884,10 @@
38613884
<key>include</key>
38623885
<string>#punctuation-comma</string>
38633886
</dict>
3887+
<dict>
3888+
<key>include</key>
3889+
<string>#punctuation-semicolon</string>
3890+
</dict>
38643891
</array>
38653892
</dict>
38663893
<key>type-operator</key>

‎TypeScriptReact.YAML-tmLanguage

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ repository:
2828
- include: '#control-statement'
2929
# add label
3030
- include: '#expression'
31+
- include: '#punctuation-semicolon'
3132

3233
var-expr:
3334
name: meta.var.expr.tsx
@@ -437,6 +438,8 @@ repository:
437438
- include: '#access-modifier'
438439
- include: '#static-modifier'
439440
- include: '#property-accessor'
441+
- include: '#punctuation-comma'
442+
- include: '#punctuation-semicolon'
440443

441444
type-object:
442445
name: meta.object.type.tsx
@@ -457,6 +460,7 @@ repository:
457460
- include: '#indexer-declaration'
458461
- include: '#type-annotation'
459462
- include: '#punctuation-comma'
463+
- include: '#punctuation-semicolon'
460464

461465
field-declaration:
462466
name: meta.field.declaration.tsx
@@ -851,6 +855,7 @@ repository:
851855
patterns:
852856
- include: '#var-expr'
853857
- include: '#expression'
858+
- include: '#punctuation-semicolon'
854859

855860
switch-expression:
856861
name: switch-expression.expr.tsx
@@ -1063,6 +1068,10 @@ repository:
10631068
name: punctuation.separator.comma.tsx
10641069
match: ','
10651070

1071+
punctuation-semicolon:
1072+
name: punctuation.terminator.statement.tsx
1073+
match: ';'
1074+
10661075
paren-expression:
10671076
begin: \(
10681077
beginCaptures:

‎TypeScriptReact.tmLanguage

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,14 @@
375375
<key>include</key>
376376
<string>#property-accessor</string>
377377
</dict>
378+
<dict>
379+
<key>include</key>
380+
<string>#punctuation-comma</string>
381+
</dict>
382+
<dict>
383+
<key>include</key>
384+
<string>#punctuation-semicolon</string>
385+
</dict>
378386
</array>
379387
</dict>
380388
<key>class-or-interface-declaration</key>
@@ -1365,6 +1373,10 @@
13651373
<key>include</key>
13661374
<string>#expression</string>
13671375
</dict>
1376+
<dict>
1377+
<key>include</key>
1378+
<string>#punctuation-semicolon</string>
1379+
</dict>
13681380
</array>
13691381
</dict>
13701382
<key>function-call</key>
@@ -3265,6 +3277,13 @@
32653277
<key>name</key>
32663278
<string>punctuation.separator.comma.tsx</string>
32673279
</dict>
3280+
<key>punctuation-semicolon</key>
3281+
<dict>
3282+
<key>match</key>
3283+
<string>;</string>
3284+
<key>name</key>
3285+
<string>punctuation.terminator.statement.tsx</string>
3286+
</dict>
32683287
<key>qstring-double</key>
32693288
<dict>
32703289
<key>begin</key>
@@ -3708,6 +3727,10 @@
37083727
<key>include</key>
37093728
<string>#expression</string>
37103729
</dict>
3730+
<dict>
3731+
<key>include</key>
3732+
<string>#punctuation-semicolon</string>
3733+
</dict>
37113734
</array>
37123735
</dict>
37133736
<key>static-modifier</key>
@@ -4251,6 +4274,10 @@
42514274
<key>include</key>
42524275
<string>#punctuation-comma</string>
42534276
</dict>
4277+
<dict>
4278+
<key>include</key>
4279+
<string>#punctuation-semicolon</string>
4280+
</dict>
42544281
</array>
42554282
</dict>
42564283
<key>type-operator</key>

‎tests/baselines/Abstracts.baseline.txt

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ cow.makeSound();
4848
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts
4949
^^^^^^
5050
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts
51-
^^
52-
source.ts meta.class.ts
51+
^
52+
source.ts meta.class.ts punctuation.terminator.statement.ts
5353
> public yearsLeft() { return 20 - this.age; }
5454
^^^
5555
source.ts meta.class.ts
@@ -83,8 +83,12 @@ cow.makeSound();
8383
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
8484
^^^^
8585
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts
86-
^^^^^^
86+
^^^^
8787
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
88+
^
89+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
90+
^
91+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
8892
^
8993
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
9094
> abstract makeSound(): string;
@@ -106,8 +110,8 @@ cow.makeSound();
106110
source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts
107111
^^^^^^
108112
source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts
109-
^^
110-
source.ts meta.class.ts
113+
^
114+
source.ts meta.class.ts punctuation.terminator.statement.ts
111115
>}
112116
^
113117
source.ts meta.class.ts punctuation.definition.block.ts
@@ -158,8 +162,10 @@ cow.makeSound();
158162
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts
159163
^
160164
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts
161-
^^
162-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
165+
^
166+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
167+
^
168+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
163169
^
164170
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
165171
>}
@@ -212,8 +218,10 @@ cow.makeSound();
212218
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts
213219
^
214220
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts
215-
^^
216-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
221+
^
222+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
223+
^
224+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
217225
^
218226
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
219227
>}
@@ -245,8 +253,8 @@ cow.makeSound();
245253
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
246254
^
247255
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
248-
^^
249-
source.ts
256+
^
257+
source.ts punctuation.terminator.statement.ts
250258
>cow.makeSound();
251259
^^^^
252260
source.ts
@@ -256,5 +264,5 @@ cow.makeSound();
256264
source.ts meta.brace.round.ts
257265
^
258266
source.ts meta.brace.round.ts
259-
^^
260-
source.ts
267+
^
268+
source.ts punctuation.terminator.statement.ts

‎tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,10 @@ function f(x: string | ((value: string) => number)) {
157157
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts
158158
^
159159
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts keyword.operator.assignment.ts
160-
^^^^^^^^^^^^^^^
160+
^^^^^^^^^^^^^
161161
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts
162+
^
163+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts punctuation.terminator.statement.ts
162164
> }
163165
^^^^^^^^
164166
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts

0 commit comments

Comments
 (0)