Skip to content
This repository was archived by the owner on Nov 21, 2025. It is now read-only.

fix(syntaxes): Semicolons not tokenized #2162

Merged
merged 1 commit into from
Mar 28, 2025
Merged

fix(syntaxes): Semicolons not tokenized #2162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions syntaxes/expression.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
{
"include": "#punctuationComma"
},
{
"include": "#punctuationSemicolon"
},
{
"include": "#punctuationAccessor"
}
Expand Down
3 changes: 3 additions & 0 deletions syntaxes/src/expression.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ export const Expression: GrammarDefinition = {
{
include: '#punctuationComma',
},
{
include: '#punctuationSemicolon',
},
{
include: '#punctuationAccessor',
},
Expand Down
45 changes: 30 additions & 15 deletions syntaxes/test/data/expression.html.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,8 @@
# ^^^^ template.ng expression.ng entity.name.function.ts
# ^ template.ng expression.ng meta.brace.round.ts
# ^ template.ng expression.ng meta.brace.round.ts
# ^^ template.ng expression.ng
# ^ template.ng expression.ng punctuation.terminator.statement.ts
# ^ template.ng expression.ng
# ^^ template.ng punctuation.definition.block.ts
>{{ call().object }}
#^^ template.ng punctuation.definition.block.ts
Expand All @@ -325,7 +326,8 @@
# ^ template.ng expression.ng meta.brace.round.ts
# ^ template.ng expression.ng punctuation.accessor.ts
# ^^^^^^ template.ng expression.ng variable.other.property.ts
# ^^ template.ng expression.ng
# ^ template.ng expression.ng punctuation.terminator.statement.ts
# ^ template.ng expression.ng
# ^^ template.ng punctuation.definition.block.ts
>{{ call()?.conditional }}
#^^ template.ng punctuation.definition.block.ts
Expand All @@ -345,7 +347,8 @@
# ^ template.ng expression.ng meta.brace.round.ts
# ^^ template.ng expression.ng punctuation.accessor.ts
# ^^^^^^^^^^^ template.ng expression.ng variable.other.property.ts
# ^^ template.ng expression.ng
# ^ template.ng expression.ng punctuation.terminator.statement.ts
# ^ template.ng expression.ng
# ^^ template.ng punctuation.definition.block.ts
>{{ call()!.conditional }}
#^^ template.ng punctuation.definition.block.ts
Expand All @@ -367,7 +370,8 @@
# ^ template.ng expression.ng keyword.operator.logical.ts
# ^ template.ng expression.ng punctuation.accessor.ts
# ^^^^^^^^^^^ template.ng expression.ng variable.other.property.ts
# ^^ template.ng expression.ng
# ^ template.ng expression.ng punctuation.terminator.statement.ts
# ^ template.ng expression.ng
# ^^ template.ng punctuation.definition.block.ts
>
><!-- Property read and method call: received -->
Expand All @@ -390,7 +394,8 @@
# ^^^^ template.ng expression.ng entity.name.function.ts
# ^ template.ng expression.ng meta.brace.round.ts
# ^ template.ng expression.ng meta.brace.round.ts
# ^^ template.ng expression.ng
# ^ template.ng expression.ng punctuation.terminator.statement.ts
# ^ template.ng expression.ng
# ^^ template.ng punctuation.definition.block.ts
>{{ object.call().object }}
#^^ template.ng punctuation.definition.block.ts
Expand All @@ -414,7 +419,8 @@
# ^ template.ng expression.ng meta.brace.round.ts
# ^ template.ng expression.ng punctuation.accessor.ts
# ^^^^^^ template.ng expression.ng variable.other.property.ts
# ^^ template.ng expression.ng
# ^ template.ng expression.ng punctuation.terminator.statement.ts
# ^ template.ng expression.ng
# ^^ template.ng punctuation.definition.block.ts
>{{ object?.call()?.conditional }}
#^^ template.ng punctuation.definition.block.ts
Expand All @@ -440,7 +446,8 @@
# ^ template.ng expression.ng meta.brace.round.ts
# ^^ template.ng expression.ng punctuation.accessor.ts
# ^^^^^^^^^^^ template.ng expression.ng variable.other.property.ts
# ^^ template.ng expression.ng
# ^ template.ng expression.ng punctuation.terminator.statement.ts
# ^ template.ng expression.ng
# ^^ template.ng punctuation.definition.block.ts
>{{ object!.call()!.conditional }}
#^^ template.ng punctuation.definition.block.ts
Expand Down Expand Up @@ -468,7 +475,8 @@
# ^ template.ng expression.ng keyword.operator.logical.ts
# ^ template.ng expression.ng punctuation.accessor.ts
# ^^^^^^^^^^^ template.ng expression.ng variable.other.property.ts
# ^^ template.ng expression.ng
# ^ template.ng expression.ng punctuation.terminator.statement.ts
# ^ template.ng expression.ng
# ^^ template.ng punctuation.definition.block.ts
>
><!-- Method call with parameters -->
Expand Down Expand Up @@ -664,7 +672,8 @@
# ^ template.ng expression.ng keyword.operator.ternary.ts
# ^ template.ng expression.ng
# ^^^^^ template.ng expression.ng constant.language.boolean.false.ts
# ^^ template.ng expression.ng
# ^ template.ng expression.ng punctuation.terminator.statement.ts
# ^ template.ng expression.ng
# ^^ template.ng punctuation.definition.block.ts
>{{ condition() ? call(1 + 2 + 3) : call() }}
#^^ template.ng punctuation.definition.block.ts
Expand Down Expand Up @@ -722,7 +731,8 @@
# ^^^^ template.ng expression.ng entity.name.function.ts
# ^ template.ng expression.ng meta.brace.round.ts
# ^ template.ng expression.ng meta.brace.round.ts
# ^^ template.ng expression.ng
# ^ template.ng expression.ng punctuation.terminator.statement.ts
# ^ template.ng expression.ng
# ^^ template.ng punctuation.definition.block.ts
>{{ condition()?.object ? call()!.test() : false }}
#^^ template.ng punctuation.definition.block.ts
Expand Down Expand Up @@ -1078,7 +1088,8 @@
# ^^^^^^^^^ template.ng expression.ng meta.array.literal.ts string.quoted.single.ts
# ^ template.ng expression.ng meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts
# ^ template.ng expression.ng meta.array.literal.ts meta.brace.square.ts
# ^^ template.ng expression.ng
# ^ template.ng expression.ng punctuation.terminator.statement.ts
# ^ template.ng expression.ng
# ^^^^^ template.ng expression.ng variable.other.readwrite.ts
>as i }}
#^^ template.ng expression.ng storage.type.as.ts
Expand Down Expand Up @@ -1115,15 +1126,17 @@
# ^^ template.ng expression.ng storage.type.as.ts
# ^ template.ng expression.ng
# ^ template.ng expression.ng entity.name.type.ts
# ^^ template.ng expression.ng
# ^ template.ng expression.ng punctuation.terminator.statement.ts
# ^ template.ng expression.ng
# ^^^ template.ng expression.ng storage.type.ts
# ^ template.ng expression.ng
# ^ template.ng expression.ng variable.other.readwrite.ts
# ^ template.ng expression.ng
# ^ template.ng expression.ng keyword.operator.assignment.ts
# ^ template.ng expression.ng
# ^^^^^ template.ng expression.ng variable.other.readwrite.ts
# ^^ template.ng expression.ng
# ^ template.ng expression.ng punctuation.terminator.statement.ts
# ^ template.ng expression.ng
# ^^^ template.ng expression.ng storage.type.ts
# ^ template.ng expression.ng
# ^^^^^ template.ng expression.ng variable.other.readwrite.ts
Expand Down Expand Up @@ -1177,15 +1190,17 @@
# ^^^^^^^^^ template.ng expression.ng meta.array.literal.ts string.quoted.single.ts
# ^ template.ng expression.ng meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts
# ^ template.ng expression.ng meta.array.literal.ts meta.brace.square.ts
# ^^ template.ng expression.ng
# ^ template.ng expression.ng punctuation.terminator.statement.ts
# ^ template.ng expression.ng
# ^^^ template.ng expression.ng storage.type.ts
# ^ template.ng expression.ng
# ^ template.ng expression.ng variable.other.readwrite.ts
>= index; }}
#^ template.ng expression.ng keyword.operator.assignment.ts
# ^ template.ng expression.ng
# ^^^^^ template.ng expression.ng variable.other.readwrite.ts
# ^^ template.ng expression.ng
# ^ template.ng expression.ng punctuation.terminator.statement.ts
# ^ template.ng expression.ng
# ^^ template.ng punctuation.definition.block.ts
>
>
13 changes: 8 additions & 5 deletions syntaxes/test/data/template-blocks.html.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@
# ^^ template.blocks.ng control.block.ng control.block.expression.ng keyword.operator.expression.of.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
# ^^ template.blocks.ng control.block.ng control.block.expression.ng
# ^ template.blocks.ng control.block.ng control.block.expression.ng punctuation.terminator.statement.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng
# ^^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
Expand All @@ -170,13 +171,13 @@
> items;
#^^^^ template.blocks.ng control.block.ng control.block.expression.ng
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
# ^^ template.blocks.ng control.block.ng control.block.expression.ng
# ^ template.blocks.ng control.block.ng control.block.expression.ng punctuation.terminator.statement.ts
> track $index;
#^^^^ template.blocks.ng control.block.ng control.block.expression.ng
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng
# ^^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
# ^^ template.blocks.ng control.block.ng control.block.expression.ng
# ^ template.blocks.ng control.block.ng control.block.expression.ng punctuation.terminator.statement.ts
> let o = $odd
#^^^^ template.blocks.ng control.block.ng control.block.expression.ng
# ^^^ template.blocks.ng control.block.ng control.block.expression.ng storage.type.ts
Expand Down Expand Up @@ -221,7 +222,8 @@
# ^^ template.blocks.ng control.block.ng control.block.expression.ng keyword.operator.expression.of.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
# ^^ template.blocks.ng control.block.ng control.block.expression.ng
# ^ template.blocks.ng control.block.ng control.block.expression.ng punctuation.terminator.statement.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng
# ^^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
Expand All @@ -241,7 +243,8 @@
# ^^ template.blocks.ng control.block.ng control.block.expression.ng keyword.operator.expression.of.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
# ^^ template.blocks.ng control.block.ng control.block.expression.ng
# ^ template.blocks.ng control.block.ng control.block.expression.ng punctuation.terminator.statement.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng
# ^^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
Expand Down
Loading
Loading