Skip to content

Commit b424eaa

Browse files
atscottatscott
authored
refactor(syntaxes): Update embedded languages and block name (#1967)
This commit updates the embedded languages of template.blocks.ng to more accurately reflect content. It also makes expressions switch the javascript language. Lastly, this updates the block capture to name the entire content control.block.ng rather than just contentName, which excluded the block name and expression.
1 parent 208e6e3 commit b424eaa

File tree

6 files changed

+69
-59
lines changed

6 files changed

+69
-59
lines changed

‎.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU=

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Input hashes for repository rule npm_translate_lock(name = "npm", pnpm_lock = "//:pnpm-lock.yaml").
33
# This file should be checked into version control along with the pnpm-lock.yaml file.
44
.npmrc=974837034
5-
pnpm-lock.yaml=1988059937
6-
yarn.lock=448809282
7-
package.json=172429918
5+
pnpm-lock.yaml=-1342496482
6+
yarn.lock=-1243860663
7+
package.json=1843460007
88
pnpm-workspace.yaml=1711114604

‎package.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,22 @@
164164
{
165165
"path": "./syntaxes/template.json",
166166
"scopeName": "template.ng",
167-
"injectTo": ["text.html.derivative", "source.ts"]
167+
"injectTo": ["text.html.derivative", "source.ts"],
168+
"embeddedLanguages": {
169+
"text.html": "html",
170+
"source.css": "css",
171+
"expression.ng": "javascript"
172+
}
168173
},
169174
{
170175
"path": "./syntaxes/template-blocks.json",
171176
"scopeName": "template.blocks.ng",
172-
"injectTo": ["text.html.derivative", "source.ts"]
177+
"injectTo": ["text.html.derivative", "source.ts"],
178+
"embeddedLanguages": {
179+
"text.html": "html",
180+
"control.block.expression.ng": "javascript",
181+
"control.block.body.ng": "html"
182+
}
173183
},
174184
{
175185
"path": "./syntaxes/let-declaration.json",

‎pnpm-lock.yaml

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎syntaxes/src/template-blocks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const TemplateBlocks: GrammarDefinition = {
3333
2: {name: 'keyword.control.block.kind.ng'},
3434
},
3535
patterns: [{include: '#blockExpression'}, {include: '#blockBody'}],
36-
contentName: 'control.block.ng',
36+
name: 'control.block.ng',
3737
// The block ends at the close `}` but we don't capture it here because. It's captured instead
3838
// by the #blockBody.
3939
end: /(?<=\})/,

‎syntaxes/template-blocks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"include": "#blockBody"
3434
}
3535
],
36-
"contentName": "control.block.ng",
36+
"name": "control.block.ng",
3737
"end": "(?<=\\})"
3838
},
3939
"blockExpression": {

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

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
>@defer (doSomething({111})) {
2-
#^ template.blocks.ng keyword.control.block.transition.ng
3-
# ^^^^^ template.blocks.ng keyword.control.block.kind.ng
4-
# ^ template.blocks.ng
2+
#^ template.blocks.ng control.block.ng keyword.control.block.transition.ng
3+
# ^^^^^ template.blocks.ng control.block.ng keyword.control.block.kind.ng
4+
# ^ template.blocks.ng control.block.ng
55
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
66
# ^^^^^^^^^^^ template.blocks.ng control.block.ng control.block.expression.ng entity.name.function.ts
77
# ^ template.blocks.ng control.block.ng control.block.expression.ng meta.brace.round.ts
@@ -18,19 +18,19 @@
1818
#^ template.blocks.ng control.block.ng punctuation.definition.block.ts
1919
>
2020
>@defer {
21-
#^ template.blocks.ng keyword.control.block.transition.ng
22-
# ^^^^^ template.blocks.ng keyword.control.block.kind.ng
23-
# ^ template.blocks.ng
21+
#^ template.blocks.ng control.block.ng keyword.control.block.transition.ng
22+
# ^^^^^ template.blocks.ng control.block.ng keyword.control.block.kind.ng
23+
# ^ template.blocks.ng control.block.ng
2424
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
2525
> <a></a>
2626
#^^^^^^^^^^^^ template.blocks.ng control.block.ng control.block.body.ng
2727
>}
2828
#^ template.blocks.ng control.block.ng punctuation.definition.block.ts
2929
>
3030
>@switch (a) {
31-
#^ template.blocks.ng keyword.control.block.transition.ng
32-
# ^^^^^^ template.blocks.ng keyword.control.block.kind.ng
33-
# ^ template.blocks.ng
31+
#^ template.blocks.ng control.block.ng keyword.control.block.transition.ng
32+
# ^^^^^^ template.blocks.ng control.block.ng keyword.control.block.kind.ng
33+
# ^ template.blocks.ng control.block.ng
3434
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
3535
# ^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
3636
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
@@ -50,9 +50,9 @@
5050
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
5151
> @case (2) {
5252
#^^^^ template.blocks.ng
53-
# ^ template.blocks.ng keyword.control.block.transition.ng
54-
# ^^^^ template.blocks.ng keyword.control.block.kind.ng
55-
# ^ template.blocks.ng
53+
# ^ template.blocks.ng control.block.ng keyword.control.block.transition.ng
54+
# ^^^^ template.blocks.ng control.block.ng keyword.control.block.kind.ng
55+
# ^ template.blocks.ng control.block.ng
5656
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
5757
# ^ template.blocks.ng control.block.ng control.block.expression.ng constant.numeric.decimal.ts
5858
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
@@ -72,9 +72,9 @@
7272
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
7373
> @default {
7474
#^^^^ template.blocks.ng
75-
# ^ template.blocks.ng keyword.control.block.transition.ng
76-
# ^^^^^^^ template.blocks.ng keyword.control.block.kind.ng
77-
# ^ template.blocks.ng
75+
# ^ template.blocks.ng control.block.ng keyword.control.block.transition.ng
76+
# ^^^^^^^ template.blocks.ng control.block.ng keyword.control.block.kind.ng
77+
# ^ template.blocks.ng control.block.ng
7878
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
7979
> default case
8080
#^^^^^^^^^^^^^^^^^^^^^ template.blocks.ng control.block.ng control.block.body.ng
@@ -85,9 +85,9 @@
8585
#^^ template.blocks.ng
8686
>
8787
>@if (a==b) { hello } @else { goodbye }
88-
#^ template.blocks.ng keyword.control.block.transition.ng
89-
# ^^ template.blocks.ng keyword.control.block.kind.ng
90-
# ^ template.blocks.ng
88+
#^ template.blocks.ng control.block.ng keyword.control.block.transition.ng
89+
# ^^ template.blocks.ng control.block.ng keyword.control.block.kind.ng
90+
# ^ template.blocks.ng control.block.ng
9191
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
9292
# ^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
9393
# ^^ template.blocks.ng control.block.ng control.block.expression.ng keyword.operator.comparison.ts
@@ -98,17 +98,17 @@
9898
# ^^^^^^^ template.blocks.ng control.block.ng control.block.body.ng
9999
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
100100
# ^ template.blocks.ng
101-
# ^ template.blocks.ng keyword.control.block.transition.ng
102-
# ^^^^ template.blocks.ng keyword.control.block.kind.ng
103-
# ^^ template.blocks.ng
101+
# ^ template.blocks.ng control.block.ng keyword.control.block.transition.ng
102+
# ^^^^ template.blocks.ng control.block.ng keyword.control.block.kind.ng
103+
# ^^ template.blocks.ng control.block.ng
104104
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
105105
# ^^^^^^^^^ template.blocks.ng control.block.ng control.block.body.ng
106106
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
107107
>
108108
>@if (a==b) {
109-
#^ template.blocks.ng keyword.control.block.transition.ng
110-
# ^^ template.blocks.ng keyword.control.block.kind.ng
111-
# ^ template.blocks.ng
109+
#^ template.blocks.ng control.block.ng keyword.control.block.transition.ng
110+
# ^^ template.blocks.ng control.block.ng keyword.control.block.kind.ng
111+
# ^ template.blocks.ng control.block.ng
112112
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
113113
# ^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
114114
# ^^ template.blocks.ng control.block.ng control.block.expression.ng keyword.operator.comparison.ts
@@ -122,9 +122,9 @@
122122
>} @else if (b==a) {
123123
#^ template.blocks.ng control.block.ng punctuation.definition.block.ts
124124
# ^ template.blocks.ng
125-
# ^ template.blocks.ng keyword.control.block.transition.ng
126-
# ^^^^^^^ template.blocks.ng keyword.control.block.kind.ng
127-
# ^ template.blocks.ng
125+
# ^ template.blocks.ng control.block.ng keyword.control.block.transition.ng
126+
# ^^^^^^^ template.blocks.ng control.block.ng keyword.control.block.kind.ng
127+
# ^ template.blocks.ng control.block.ng
128128
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
129129
# ^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
130130
# ^^ template.blocks.ng control.block.ng control.block.expression.ng keyword.operator.comparison.ts
@@ -139,9 +139,9 @@
139139
#^ template.blocks.ng control.block.ng punctuation.definition.block.ts
140140
>
141141
>@for (let item of items; track $index) {
142-
#^ template.blocks.ng keyword.control.block.transition.ng
143-
# ^^^ template.blocks.ng keyword.control.block.kind.ng
144-
# ^ template.blocks.ng
142+
#^ template.blocks.ng control.block.ng keyword.control.block.transition.ng
143+
# ^^^ template.blocks.ng control.block.ng keyword.control.block.kind.ng
144+
# ^ template.blocks.ng control.block.ng
145145
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
146146
# ^^^ template.blocks.ng control.block.ng control.block.expression.ng storage.type.ts
147147
# ^ template.blocks.ng control.block.ng control.block.expression.ng
@@ -163,9 +163,9 @@
163163
#^ template.blocks.ng control.block.ng punctuation.definition.block.ts
164164
>
165165
>@if (
166-
#^ template.blocks.ng keyword.control.block.transition.ng
167-
# ^^ template.blocks.ng keyword.control.block.kind.ng
168-
# ^ template.blocks.ng
166+
#^ template.blocks.ng control.block.ng keyword.control.block.transition.ng
167+
# ^^ template.blocks.ng control.block.ng keyword.control.block.kind.ng
168+
# ^ template.blocks.ng control.block.ng
169169
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
170170
> items;
171171
#^^^^ template.blocks.ng control.block.ng control.block.expression.ng
@@ -199,9 +199,9 @@
199199
#^ template.blocks.ng control.block.ng punctuation.definition.block.ts
200200
>
201201
>@if
202-
#^ template.blocks.ng keyword.control.block.transition.ng
203-
# ^^ template.blocks.ng keyword.control.block.kind.ng
204-
# ^^ template.blocks.ng
202+
#^ template.blocks.ng control.block.ng keyword.control.block.transition.ng
203+
# ^^ template.blocks.ng control.block.ng keyword.control.block.kind.ng
204+
# ^^ template.blocks.ng control.block.ng
205205
>(items) {}
206206
#^ template.blocks.ng control.block.ng meta.brace.round.ts
207207
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
@@ -211,9 +211,9 @@
211211
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
212212
>
213213
>@for
214-
#^ template.blocks.ng keyword.control.block.transition.ng
215-
# ^^^ template.blocks.ng keyword.control.block.kind.ng
216-
# ^^ template.blocks.ng
214+
#^ template.blocks.ng control.block.ng keyword.control.block.transition.ng
215+
# ^^^ template.blocks.ng control.block.ng keyword.control.block.kind.ng
216+
# ^^ template.blocks.ng control.block.ng
217217
>(item of items; track $index) { }
218218
#^ template.blocks.ng control.block.ng meta.brace.round.ts
219219
# ^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
@@ -232,9 +232,9 @@
232232
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
233233
>
234234
>@for (item of items; track $index) {
235-
#^ template.blocks.ng keyword.control.block.transition.ng
236-
# ^^^ template.blocks.ng keyword.control.block.kind.ng
237-
# ^ template.blocks.ng
235+
#^ template.blocks.ng control.block.ng keyword.control.block.transition.ng
236+
# ^^^ template.blocks.ng control.block.ng keyword.control.block.kind.ng
237+
# ^ template.blocks.ng control.block.ng
238238
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
239239
# ^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
240240
# ^ template.blocks.ng control.block.ng control.block.expression.ng
@@ -254,9 +254,9 @@
254254
#^ template.blocks.ng control.block.ng punctuation.definition.block.ts
255255
# ^^ template.blocks.ng
256256
>@empty
257-
#^ template.blocks.ng keyword.control.block.transition.ng
258-
# ^^^^^ template.blocks.ng keyword.control.block.kind.ng
259-
# ^^ template.blocks.ng
257+
#^ template.blocks.ng control.block.ng keyword.control.block.transition.ng
258+
# ^^^^^ template.blocks.ng control.block.ng keyword.control.block.kind.ng
259+
# ^^ template.blocks.ng control.block.ng
260260
>{
261261
#^ template.blocks.ng control.block.ng punctuation.definition.block.ts
262262
>

0 commit comments

Comments
 (0)