Skip to content

Commit 39057fc

Browse files
dannymcgeeatscott
dannymcgee
authored and
atscott
committed
fix(syntaxes): Semicolons not tokenized
1 parent 4203809 commit 39057fc

File tree

5 files changed

+78
-41
lines changed

5 files changed

+78
-41
lines changed

‎syntaxes/expression.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
{
3535
"include": "#punctuationComma"
3636
},
37+
{
38+
"include": "#punctuationSemicolon"
39+
},
3740
{
3841
"include": "#punctuationAccessor"
3942
}

‎syntaxes/src/expression.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ export const Expression: GrammarDefinition = {
4141
{
4242
include: '#punctuationComma',
4343
},
44+
{
45+
include: '#punctuationSemicolon',
46+
},
4447
{
4548
include: '#punctuationAccessor',
4649
},

‎syntaxes/test/data/expression.html.snap‎

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,8 @@
305305
# ^^^^ template.ng expression.ng entity.name.function.ts
306306
# ^ template.ng expression.ng meta.brace.round.ts
307307
# ^ template.ng expression.ng meta.brace.round.ts
308-
# ^^ template.ng expression.ng
308+
# ^ template.ng expression.ng punctuation.terminator.statement.ts
309+
# ^ template.ng expression.ng
309310
# ^^ template.ng punctuation.definition.block.ts
310311
>{{ call().object }}
311312
#^^ template.ng punctuation.definition.block.ts
@@ -325,7 +326,8 @@
325326
# ^ template.ng expression.ng meta.brace.round.ts
326327
# ^ template.ng expression.ng punctuation.accessor.ts
327328
# ^^^^^^ template.ng expression.ng variable.other.property.ts
328-
# ^^ template.ng expression.ng
329+
# ^ template.ng expression.ng punctuation.terminator.statement.ts
330+
# ^ template.ng expression.ng
329331
# ^^ template.ng punctuation.definition.block.ts
330332
>{{ call()?.conditional }}
331333
#^^ template.ng punctuation.definition.block.ts
@@ -345,7 +347,8 @@
345347
# ^ template.ng expression.ng meta.brace.round.ts
346348
# ^^ template.ng expression.ng punctuation.accessor.ts
347349
# ^^^^^^^^^^^ template.ng expression.ng variable.other.property.ts
348-
# ^^ template.ng expression.ng
350+
# ^ template.ng expression.ng punctuation.terminator.statement.ts
351+
# ^ template.ng expression.ng
349352
# ^^ template.ng punctuation.definition.block.ts
350353
>{{ call()!.conditional }}
351354
#^^ template.ng punctuation.definition.block.ts
@@ -367,7 +370,8 @@
367370
# ^ template.ng expression.ng keyword.operator.logical.ts
368371
# ^ template.ng expression.ng punctuation.accessor.ts
369372
# ^^^^^^^^^^^ template.ng expression.ng variable.other.property.ts
370-
# ^^ template.ng expression.ng
373+
# ^ template.ng expression.ng punctuation.terminator.statement.ts
374+
# ^ template.ng expression.ng
371375
# ^^ template.ng punctuation.definition.block.ts
372376
>
373377
><!-- Property read and method call: received -->
@@ -390,7 +394,8 @@
390394
# ^^^^ template.ng expression.ng entity.name.function.ts
391395
# ^ template.ng expression.ng meta.brace.round.ts
392396
# ^ template.ng expression.ng meta.brace.round.ts
393-
# ^^ template.ng expression.ng
397+
# ^ template.ng expression.ng punctuation.terminator.statement.ts
398+
# ^ template.ng expression.ng
394399
# ^^ template.ng punctuation.definition.block.ts
395400
>{{ object.call().object }}
396401
#^^ template.ng punctuation.definition.block.ts
@@ -414,7 +419,8 @@
414419
# ^ template.ng expression.ng meta.brace.round.ts
415420
# ^ template.ng expression.ng punctuation.accessor.ts
416421
# ^^^^^^ template.ng expression.ng variable.other.property.ts
417-
# ^^ template.ng expression.ng
422+
# ^ template.ng expression.ng punctuation.terminator.statement.ts
423+
# ^ template.ng expression.ng
418424
# ^^ template.ng punctuation.definition.block.ts
419425
>{{ object?.call()?.conditional }}
420426
#^^ template.ng punctuation.definition.block.ts
@@ -440,7 +446,8 @@
440446
# ^ template.ng expression.ng meta.brace.round.ts
441447
# ^^ template.ng expression.ng punctuation.accessor.ts
442448
# ^^^^^^^^^^^ template.ng expression.ng variable.other.property.ts
443-
# ^^ template.ng expression.ng
449+
# ^ template.ng expression.ng punctuation.terminator.statement.ts
450+
# ^ template.ng expression.ng
444451
# ^^ template.ng punctuation.definition.block.ts
445452
>{{ object!.call()!.conditional }}
446453
#^^ template.ng punctuation.definition.block.ts
@@ -468,7 +475,8 @@
468475
# ^ template.ng expression.ng keyword.operator.logical.ts
469476
# ^ template.ng expression.ng punctuation.accessor.ts
470477
# ^^^^^^^^^^^ template.ng expression.ng variable.other.property.ts
471-
# ^^ template.ng expression.ng
478+
# ^ template.ng expression.ng punctuation.terminator.statement.ts
479+
# ^ template.ng expression.ng
472480
# ^^ template.ng punctuation.definition.block.ts
473481
>
474482
><!-- Method call with parameters -->
@@ -664,7 +672,8 @@
664672
# ^ template.ng expression.ng keyword.operator.ternary.ts
665673
# ^ template.ng expression.ng
666674
# ^^^^^ template.ng expression.ng constant.language.boolean.false.ts
667-
# ^^ template.ng expression.ng
675+
# ^ template.ng expression.ng punctuation.terminator.statement.ts
676+
# ^ template.ng expression.ng
668677
# ^^ template.ng punctuation.definition.block.ts
669678
>{{ condition() ? call(1 + 2 + 3) : call() }}
670679
#^^ template.ng punctuation.definition.block.ts
@@ -722,7 +731,8 @@
722731
# ^^^^ template.ng expression.ng entity.name.function.ts
723732
# ^ template.ng expression.ng meta.brace.round.ts
724733
# ^ template.ng expression.ng meta.brace.round.ts
725-
# ^^ template.ng expression.ng
734+
# ^ template.ng expression.ng punctuation.terminator.statement.ts
735+
# ^ template.ng expression.ng
726736
# ^^ template.ng punctuation.definition.block.ts
727737
>{{ condition()?.object ? call()!.test() : false }}
728738
#^^ template.ng punctuation.definition.block.ts
@@ -1078,7 +1088,8 @@
10781088
# ^^^^^^^^^ template.ng expression.ng meta.array.literal.ts string.quoted.single.ts
10791089
# ^ template.ng expression.ng meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts
10801090
# ^ template.ng expression.ng meta.array.literal.ts meta.brace.square.ts
1081-
# ^^ template.ng expression.ng
1091+
# ^ template.ng expression.ng punctuation.terminator.statement.ts
1092+
# ^ template.ng expression.ng
10821093
# ^^^^^ template.ng expression.ng variable.other.readwrite.ts
10831094
>as i }}
10841095
#^^ template.ng expression.ng storage.type.as.ts
@@ -1115,15 +1126,17 @@
11151126
# ^^ template.ng expression.ng storage.type.as.ts
11161127
# ^ template.ng expression.ng
11171128
# ^ template.ng expression.ng entity.name.type.ts
1118-
# ^^ template.ng expression.ng
1129+
# ^ template.ng expression.ng punctuation.terminator.statement.ts
1130+
# ^ template.ng expression.ng
11191131
# ^^^ template.ng expression.ng storage.type.ts
11201132
# ^ template.ng expression.ng
11211133
# ^ template.ng expression.ng variable.other.readwrite.ts
11221134
# ^ template.ng expression.ng
11231135
# ^ template.ng expression.ng keyword.operator.assignment.ts
11241136
# ^ template.ng expression.ng
11251137
# ^^^^^ template.ng expression.ng variable.other.readwrite.ts
1126-
# ^^ template.ng expression.ng
1138+
# ^ template.ng expression.ng punctuation.terminator.statement.ts
1139+
# ^ template.ng expression.ng
11271140
# ^^^ template.ng expression.ng storage.type.ts
11281141
# ^ template.ng expression.ng
11291142
# ^^^^^ template.ng expression.ng variable.other.readwrite.ts
@@ -1177,15 +1190,17 @@
11771190
# ^^^^^^^^^ template.ng expression.ng meta.array.literal.ts string.quoted.single.ts
11781191
# ^ template.ng expression.ng meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts
11791192
# ^ template.ng expression.ng meta.array.literal.ts meta.brace.square.ts
1180-
# ^^ template.ng expression.ng
1193+
# ^ template.ng expression.ng punctuation.terminator.statement.ts
1194+
# ^ template.ng expression.ng
11811195
# ^^^ template.ng expression.ng storage.type.ts
11821196
# ^ template.ng expression.ng
11831197
# ^ template.ng expression.ng variable.other.readwrite.ts
11841198
>= index; }}
11851199
#^ template.ng expression.ng keyword.operator.assignment.ts
11861200
# ^ template.ng expression.ng
11871201
# ^^^^^ template.ng expression.ng variable.other.readwrite.ts
1188-
# ^^ template.ng expression.ng
1202+
# ^ template.ng expression.ng punctuation.terminator.statement.ts
1203+
# ^ template.ng expression.ng
11891204
# ^^ template.ng punctuation.definition.block.ts
11901205
>
11911206
>

‎syntaxes/test/data/template-blocks.html.snap‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@
150150
# ^^ template.blocks.ng control.block.ng control.block.expression.ng keyword.operator.expression.of.ts
151151
# ^ template.blocks.ng control.block.ng control.block.expression.ng
152152
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
153-
# ^^ template.blocks.ng control.block.ng control.block.expression.ng
153+
# ^ template.blocks.ng control.block.ng control.block.expression.ng punctuation.terminator.statement.ts
154+
# ^ template.blocks.ng control.block.ng control.block.expression.ng
154155
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
155156
# ^ template.blocks.ng control.block.ng control.block.expression.ng
156157
# ^^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
@@ -170,13 +171,13 @@
170171
> items;
171172
#^^^^ template.blocks.ng control.block.ng control.block.expression.ng
172173
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
173-
# ^^ template.blocks.ng control.block.ng control.block.expression.ng
174+
# ^ template.blocks.ng control.block.ng control.block.expression.ng punctuation.terminator.statement.ts
174175
> track $index;
175176
#^^^^ template.blocks.ng control.block.ng control.block.expression.ng
176177
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
177178
# ^ template.blocks.ng control.block.ng control.block.expression.ng
178179
# ^^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
179-
# ^^ template.blocks.ng control.block.ng control.block.expression.ng
180+
# ^ template.blocks.ng control.block.ng control.block.expression.ng punctuation.terminator.statement.ts
180181
> let o = $odd
181182
#^^^^ template.blocks.ng control.block.ng control.block.expression.ng
182183
# ^^^ template.blocks.ng control.block.ng control.block.expression.ng storage.type.ts
@@ -221,7 +222,8 @@
221222
# ^^ template.blocks.ng control.block.ng control.block.expression.ng keyword.operator.expression.of.ts
222223
# ^ template.blocks.ng control.block.ng control.block.expression.ng
223224
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
224-
# ^^ template.blocks.ng control.block.ng control.block.expression.ng
225+
# ^ template.blocks.ng control.block.ng control.block.expression.ng punctuation.terminator.statement.ts
226+
# ^ template.blocks.ng control.block.ng control.block.expression.ng
225227
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
226228
# ^ template.blocks.ng control.block.ng control.block.expression.ng
227229
# ^^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
@@ -241,7 +243,8 @@
241243
# ^^ template.blocks.ng control.block.ng control.block.expression.ng keyword.operator.expression.of.ts
242244
# ^ template.blocks.ng control.block.ng control.block.expression.ng
243245
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
244-
# ^^ template.blocks.ng control.block.ng control.block.expression.ng
246+
# ^ template.blocks.ng control.block.ng control.block.expression.ng punctuation.terminator.statement.ts
247+
# ^ template.blocks.ng control.block.ng control.block.expression.ng
245248
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
246249
# ^ template.blocks.ng control.block.ng control.block.expression.ng
247250
# ^^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts

0 commit comments

Comments
 (0)