Skip to content

Commit 0aa2aa5

Browse files
dannymcgeeatscott
dannymcgee
authored and
atscott
committed
fix(syntaxes): variable token for @let binding
1 parent 8c84410 commit 0aa2aa5

File tree

3 files changed

+58
-58
lines changed

3 files changed

+58
-58
lines changed

‎syntaxes/let-declaration.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
],
99
"repository": {
1010
"letDeclaration": {
11+
"name": "meta.definition.variable.ng",
1112
"begin": "(@let)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)?",
1213
"beginCaptures": {
1314
"1": {
1415
"name": "storage.type.ng"
1516
},
1617
"2": {
17-
"name": "meta.definition.variable.ng"
18+
"name": "variable.other.constant.ng"
1819
},
1920
"3": {
2021
"name": "keyword.operator.assignment.ng"
@@ -25,7 +26,6 @@
2526
"include": "#letInitializer"
2627
}
2728
],
28-
"contentName": "meta.definition.variable.ng",
2929
"end": "(?<=;)"
3030
},
3131
"letInitializer": {

‎syntaxes/src/template-let-declaration.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ export const LetDeclaration: GrammarDefinition = {
1616
],
1717
repository: {
1818
letDeclaration: {
19+
name: 'meta.definition.variable.ng',
1920
// Equals group is optional so that we start highlighting as
2021
// soon as the user starts writing a valid name.
2122
begin: /(@let)\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)?/,
2223
beginCaptures: {
2324
1: {name: 'storage.type.ng'},
24-
2: {name: 'meta.definition.variable.ng'},
25+
2: {name: 'variable.other.constant.ng'},
2526
3: {name: 'keyword.operator.assignment.ng'},
2627
},
2728
patterns: [{include: '#letInitializer'}],
28-
contentName: 'meta.definition.variable.ng',
2929
end: /(?<=;)/,
3030
},
3131

‎syntaxes/test/data/let-declaration.html.snap‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
>@let basicLet = 123 + 456;
2-
#^^^^ template.let.ng storage.type.ng
3-
# ^ template.let.ng
4-
# ^^^^^^^^ template.let.ng meta.definition.variable.ng
5-
# ^ template.let.ng
6-
# ^ template.let.ng keyword.operator.assignment.ng
2+
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
3+
# ^ template.let.ng meta.definition.variable.ng
4+
# ^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
5+
# ^ template.let.ng meta.definition.variable.ng
6+
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
77
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
88
# ^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.numeric.decimal.ts
99
# ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng
@@ -13,47 +13,47 @@
1313
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
1414
>
1515
>@let noSpaceAfterEquals =true;
16-
#^^^^ template.let.ng storage.type.ng
17-
# ^ template.let.ng
18-
# ^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
19-
# ^ template.let.ng
20-
# ^ template.let.ng keyword.operator.assignment.ng
16+
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
17+
# ^ template.let.ng meta.definition.variable.ng
18+
# ^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
19+
# ^ template.let.ng meta.definition.variable.ng
20+
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
2121
# ^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.language.boolean.true.ts
2222
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
2323
>
2424
>@let noSpaceBeforeEquals= true;
25-
#^^^^ template.let.ng storage.type.ng
26-
# ^ template.let.ng
27-
# ^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
28-
# ^ template.let.ng keyword.operator.assignment.ng
25+
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
26+
# ^ template.let.ng meta.definition.variable.ng
27+
# ^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
28+
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
2929
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
3030
# ^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.language.boolean.true.ts
3131
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
3232
>
3333
>@let noSpaceAroundEquals=true;
34-
#^^^^ template.let.ng storage.type.ng
35-
# ^ template.let.ng
36-
# ^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
37-
# ^ template.let.ng keyword.operator.assignment.ng
34+
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
35+
# ^ template.let.ng meta.definition.variable.ng
36+
# ^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
37+
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
3838
# ^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.language.boolean.true.ts
3939
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
4040
>
4141
>@let lotOfSpaceAroundEquals = true;
42-
#^^^^ template.let.ng storage.type.ng
43-
# ^^^^^^^^^^^^^^^^^^^^ template.let.ng
44-
# ^^^^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
45-
# ^^^^^^ template.let.ng
46-
# ^ template.let.ng keyword.operator.assignment.ng
42+
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
43+
# ^^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
44+
# ^^^^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
45+
# ^^^^^^ template.let.ng meta.definition.variable.ng
46+
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
4747
# ^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
4848
# ^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.language.boolean.true.ts
4949
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
5050
>
5151
>@let #invalid = true;
5252
#^^^^^^^^^^^^^^^^^^^^^^ template.let.ng
5353
>@let invalidIn#TheMiddle = true;
54-
#^^^^ template.let.ng storage.type.ng
55-
# ^ template.let.ng
56-
# ^^^^^^^^^ template.let.ng meta.definition.variable.ng
54+
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
55+
# ^ template.let.ng meta.definition.variable.ng
56+
# ^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
5757
# ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng
5858
# ^^^^^^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng variable.other.readwrite.ts
5959
# ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng
@@ -65,11 +65,11 @@
6565
#^^^^^^^^^^^^^^^^^^^^ template.let.ng
6666
>
6767
>@let stringContainingSemicolon = 'hello ;' + 'world';
68-
#^^^^ template.let.ng storage.type.ng
69-
# ^ template.let.ng
70-
# ^^^^^^^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
71-
# ^ template.let.ng
72-
# ^ template.let.ng keyword.operator.assignment.ng
68+
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
69+
# ^ template.let.ng meta.definition.variable.ng
70+
# ^^^^^^^^^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
71+
# ^ template.let.ng meta.definition.variable.ng
72+
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
7373
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
7474
# ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng string.quoted.single.ts punctuation.definition.string.begin.ts
7575
# ^^^^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng string.quoted.single.ts
@@ -83,11 +83,11 @@
8383
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
8484
>
8585
>@let complexExpression = something ? 123 : {prop: 'hello' + true + 'world'};
86-
#^^^^ template.let.ng storage.type.ng
87-
# ^ template.let.ng
88-
# ^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
89-
# ^ template.let.ng
90-
# ^ template.let.ng keyword.operator.assignment.ng
86+
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
87+
# ^ template.let.ng meta.definition.variable.ng
88+
# ^^^^^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
89+
# ^ template.let.ng meta.definition.variable.ng
90+
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
9191
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
9292
# ^^^^^^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng variable.other.readwrite.ts
9393
# ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng
@@ -116,11 +116,11 @@
116116
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
117117
>
118118
>@let usingPipes = 123 + foo | async | multiply: 2 | separator: ';';
119-
#^^^^ template.let.ng storage.type.ng
120-
# ^ template.let.ng
121-
# ^^^^^^^^^^ template.let.ng meta.definition.variable.ng
122-
# ^ template.let.ng
123-
# ^ template.let.ng keyword.operator.assignment.ng
119+
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
120+
# ^ template.let.ng meta.definition.variable.ng
121+
# ^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
122+
# ^ template.let.ng meta.definition.variable.ng
123+
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
124124
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
125125
# ^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.numeric.decimal.ts
126126
# ^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng
@@ -151,11 +151,11 @@
151151
#^^^^^^^^^^^^^^^^^^^^^^^^^ template.let.ng
152152
> @let inBlock = true;
153153
#^^ template.let.ng
154-
# ^^^^ template.let.ng storage.type.ng
155-
# ^ template.let.ng
156-
# ^^^^^^^ template.let.ng meta.definition.variable.ng
157-
# ^ template.let.ng
158-
# ^ template.let.ng keyword.operator.assignment.ng
154+
# ^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
155+
# ^ template.let.ng meta.definition.variable.ng
156+
# ^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
157+
# ^ template.let.ng meta.definition.variable.ng
158+
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
159159
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
160160
# ^^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.language.boolean.true.ts
161161
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
@@ -164,11 +164,11 @@
164164
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ template.let.ng
165165
> @let inNestedBlock = 123;
166166
#^^^^ template.let.ng
167-
# ^^^^ template.let.ng storage.type.ng
168-
# ^ template.let.ng
169-
# ^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng
170-
# ^ template.let.ng
171-
# ^ template.let.ng keyword.operator.assignment.ng
167+
# ^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
168+
# ^ template.let.ng meta.definition.variable.ng
169+
# ^^^^^^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
170+
# ^ template.let.ng meta.definition.variable.ng
171+
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
172172
# ^ template.let.ng meta.definition.variable.ng keyword.operator.assignment.ng
173173
# ^^^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng constant.numeric.decimal.ts
174174
# ^ template.let.ng meta.definition.variable.ng punctuation.terminator.statement.ng
@@ -178,9 +178,9 @@
178178
#^^ template.let.ng
179179
>
180180
>@let noEquals
181-
#^^^^ template.let.ng storage.type.ng
182-
# ^ template.let.ng
183-
# ^^^^^^^^ template.let.ng meta.definition.variable.ng
181+
#^^^^ template.let.ng meta.definition.variable.ng storage.type.ng
182+
# ^ template.let.ng meta.definition.variable.ng
183+
# ^^^^^^^^ template.let.ng meta.definition.variable.ng variable.other.constant.ng
184184
>
185185
>@let noValue =
186186
#^ template.let.ng meta.definition.variable.ng meta.definition.variable.initializer.ng

0 commit comments

Comments
 (0)