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

fix(syntaxes): variable token for @let binding #2160

Merged
merged 1 commit into from
Mar 28, 2025
Merged

fix(syntaxes): variable token for @let binding #2160

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
4 changes: 2 additions & 2 deletions syntaxes/let-declaration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
],
"repository": {
"letDeclaration": {
"name": "meta.definition.variable.ng",
"begin": "(@let)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)?",
"beginCaptures": {
"1": {
"name": "storage.type.ng"
},
"2": {
"name": "meta.definition.variable.ng"
"name": "variable.other.constant.ng"
},
"3": {
"name": "keyword.operator.assignment.ng"
Expand All @@ -25,7 +26,6 @@
"include": "#letInitializer"
}
],
"contentName": "meta.definition.variable.ng",
"end": "(?<=;)"
},
"letInitializer": {
Expand Down
4 changes: 2 additions & 2 deletions syntaxes/src/template-let-declaration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ export const LetDeclaration: GrammarDefinition = {
],
repository: {
letDeclaration: {
name: 'meta.definition.variable.ng',
// Equals group is optional so that we start highlighting as
// soon as the user starts writing a valid name.
begin: /(@let)\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)?/,
beginCaptures: {
1: {name: 'storage.type.ng'},
2: {name: 'meta.definition.variable.ng'},
2: {name: 'variable.other.constant.ng'},
3: {name: 'keyword.operator.assignment.ng'},
},
patterns: [{include: '#letInitializer'}],
contentName: 'meta.definition.variable.ng',
end: /(?<=;)/,
},

Expand Down
108 changes: 54 additions & 54 deletions syntaxes/test/data/let-declaration.html.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
>@let basicLet = 123 + 456;
#^^^^ template.let.ng storage.type.ng
# ^ template.let.ng
# ^^^^^^^^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng
# ^ template.let.ng keyword.operator.assignment.ng
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
# ^ template.let.ng meta.definition.variable.ng
# ^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
# ^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.numeric.decimal.ts
# ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng
Expand All @@ -13,47 +13,47 @@
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
>
>@let noSpaceAfterEquals =true;
#^^^^ template.let.ng storage.type.ng
# ^ template.let.ng
# ^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng
# ^ template.let.ng keyword.operator.assignment.ng
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
# ^ template.let.ng meta.definition.variable.ng
# ^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
# ^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.language.boolean.true.ts
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
>
>@let noSpaceBeforeEquals= true;
#^^^^ template.let.ng storage.type.ng
# ^ template.let.ng
# ^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng keyword.operator.assignment.ng
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
# ^ template.let.ng meta.definition.variable.ng
# ^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.language.boolean.true.ts
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
>
>@let noSpaceAroundEquals=true;
#^^^^ template.let.ng storage.type.ng
# ^ template.let.ng
# ^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng keyword.operator.assignment.ng
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
# ^ template.let.ng meta.definition.variable.ng
# ^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.language.boolean.true.ts
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
>
>@let lotOfSpaceAroundEquals = true;
#^^^^ template.let.ng storage.type.ng
# ^^^^^^^^^^^^^^^^^^^^ template.let.ng
# ^^^^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
# ^^^^^^ template.let.ng
# ^ template.let.ng keyword.operator.assignment.ng
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
# ^^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
# ^^^^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
# ^^^^^^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.language.boolean.true.ts
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
>
>@let #invalid = true;
#^^^^^^^^^^^^^^^^^^^^^^ template.let.ng
>@let invalidIn#TheMiddle = true;
#^^^^ template.let.ng storage.type.ng
# ^ template.let.ng
# ^^^^^^^^^ template.let.ng meta.definition.variable.ng
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
# ^ template.let.ng meta.definition.variable.ng
# ^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
# ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng
# ^^^^^^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng variable.other.readwrite.ts
# ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng
Expand All @@ -65,11 +65,11 @@
#^^^^^^^^^^^^^^^^^^^^ template.let.ng
>
>@let stringContainingSemicolon = 'hello ;' + 'world';
#^^^^ template.let.ng storage.type.ng
# ^ template.let.ng
# ^^^^^^^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng
# ^ template.let.ng keyword.operator.assignment.ng
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
# ^ template.let.ng meta.definition.variable.ng
# ^^^^^^^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
# ^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng string.quoted.single.ts punctuation.definition.string.begin.ts
# ^^^^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng string.quoted.single.ts
Expand All @@ -83,11 +83,11 @@
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
>
>@let complexExpression = something ? 123 : {prop: 'hello' + true + 'world'};
#^^^^ template.let.ng storage.type.ng
# ^ template.let.ng
# ^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng
# ^ template.let.ng keyword.operator.assignment.ng
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
# ^ template.let.ng meta.definition.variable.ng
# ^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
# ^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^^^^^^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng variable.other.readwrite.ts
# ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng
Expand Down Expand Up @@ -116,11 +116,11 @@
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
>
>@let usingPipes = 123 + foo | async | multiply: 2 | separator: ';';
#^^^^ template.let.ng storage.type.ng
# ^ template.let.ng
# ^^^^^^^^^^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng
# ^ template.let.ng keyword.operator.assignment.ng
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
# ^ template.let.ng meta.definition.variable.ng
# ^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
# ^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.numeric.decimal.ts
# ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng
Expand Down Expand Up @@ -151,11 +151,11 @@
#^^^^^^^^^^^^^^^^^^^^^^^^^ template.let.ng
> @let inBlock = true;
#^^ template.let.ng
# ^^^^ template.let.ng storage.type.ng
# ^ template.let.ng
# ^^^^^^^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng
# ^ template.let.ng keyword.operator.assignment.ng
# ^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
# ^ template.let.ng meta.definition.variable.ng
# ^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
# ^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.language.boolean.true.ts
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
Expand All @@ -164,11 +164,11 @@
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ template.let.ng
> @let inNestedBlock = 123;
#^^^^ template.let.ng
# ^^^^ template.let.ng storage.type.ng
# ^ template.let.ng
# ^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng
# ^ template.let.ng keyword.operator.assignment.ng
# ^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
# ^ template.let.ng meta.definition.variable.ng
# ^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
# ^ template.let.ng meta.definition.variable.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
# ^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.numeric.decimal.ts
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
Expand All @@ -178,9 +178,9 @@
#^^ template.let.ng
>
>@let noEquals
#^^^^ template.let.ng storage.type.ng
# ^ template.let.ng
# ^^^^^^^^ template.let.ng meta.definition.variable.ng
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
# ^ template.let.ng meta.definition.variable.ng
# ^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
>
>@let noValue =
#^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng
Expand Down
Loading