Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(syntaxes): Only match known block names #2034

Merged
merged 1 commit into from
May 17, 2024
Merged

fix(syntaxes): Only match known block names #2034

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
8 changes: 2 additions & 6 deletions syntaxes/src/template-blocks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,8 @@ export const TemplateBlocks: GrammarDefinition = {
},

block: {
// @ followed by words and spaces. Also require a { or ( on the same line but don't capture
// it.
// The parser doesn't require this but we do for syntax highlighting to be more exclusive
// since
// the extension can be used for older versions of Angular.
begin: /(@)((?:\w+\s*)+)(?=\(|\{)/,
begin:
/(@)(if|else if|else|defer|placeholder|loading|error|switch|case|default|for|empty)(?:\s*)/,
beginCaptures: {
1: {
patterns: [
Expand Down
2 changes: 1 addition & 1 deletion syntaxes/template-blocks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"name": "keyword.control.block.transition.ng"
},
"block": {
"begin": "(@)((?:\\w+\\s*)+)(?=\\(|\\{)",
"begin": "(@)(if|else if|else|defer|placeholder|loading|error|switch|case|default|for|empty)(?:\\s*)",
"beginCaptures": {
"1": {
"patterns": [
Expand Down
16 changes: 13 additions & 3 deletions syntaxes/test/data/template-blocks.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,21 @@
{{o}}
}

<!-- Should not highlight -->
@if
(items) {}

@for
(item of items; track $index) { }

@for (item of items; track $index) {

}
@empty
{

}

<!-- Should not highlight -->

some.email@google.com ({}) {}

@for
(let item of items; track $index) { }
106 changes: 87 additions & 19 deletions syntaxes/test/data/template-blocks.html.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
>@defer (doSomething({111})) {
#^ template.blocks.ng keyword.control.block.transition.ng
# ^^^^^^ template.blocks.ng keyword.control.block.kind.ng
# ^^^^^ template.blocks.ng keyword.control.block.kind.ng
# ^ template.blocks.ng
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
# ^^^^^^^^^^^ template.blocks.ng control.block.ng control.block.expression.ng entity.name.function.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng meta.brace.round.ts
Expand All @@ -18,7 +19,8 @@
>
>@defer {
#^ template.blocks.ng keyword.control.block.transition.ng
# ^^^^^^ template.blocks.ng keyword.control.block.kind.ng
# ^^^^^ template.blocks.ng keyword.control.block.kind.ng
# ^ template.blocks.ng
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
> <a></a>
#^^^^^^^^^^^^ template.blocks.ng control.block.ng control.block.body.ng
Expand All @@ -27,7 +29,8 @@
>
>@switch (a) {
#^ template.blocks.ng keyword.control.block.transition.ng
# ^^^^^^^ template.blocks.ng keyword.control.block.kind.ng
# ^^^^^^ template.blocks.ng keyword.control.block.kind.ng
# ^ template.blocks.ng
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
Expand All @@ -48,7 +51,8 @@
> @case (2) {
#^^^^ template.blocks.ng
# ^ template.blocks.ng keyword.control.block.transition.ng
# ^^^^^ template.blocks.ng keyword.control.block.kind.ng
# ^^^^ template.blocks.ng keyword.control.block.kind.ng
# ^ template.blocks.ng
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng constant.numeric.decimal.ts
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
Expand All @@ -69,7 +73,8 @@
> @default {
#^^^^ template.blocks.ng
# ^ template.blocks.ng keyword.control.block.transition.ng
# ^^^^^^^^ template.blocks.ng keyword.control.block.kind.ng
# ^^^^^^^ template.blocks.ng keyword.control.block.kind.ng
# ^ template.blocks.ng
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
> default case
#^^^^^^^^^^^^^^^^^^^^^ template.blocks.ng control.block.ng control.block.body.ng
Expand All @@ -81,7 +86,8 @@
>
>@if (a==b) { hello } @else { goodbye }
#^ template.blocks.ng keyword.control.block.transition.ng
# ^^^ template.blocks.ng keyword.control.block.kind.ng
# ^^ template.blocks.ng keyword.control.block.kind.ng
# ^ template.blocks.ng
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
# ^^ template.blocks.ng control.block.ng control.block.expression.ng keyword.operator.comparison.ts
Expand All @@ -93,14 +99,16 @@
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
# ^ template.blocks.ng
# ^ template.blocks.ng keyword.control.block.transition.ng
# ^^^^^^ template.blocks.ng keyword.control.block.kind.ng
# ^^^^ template.blocks.ng keyword.control.block.kind.ng
# ^^ template.blocks.ng
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
# ^^^^^^^^^ template.blocks.ng control.block.ng control.block.body.ng
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
>
>@if (a==b) {
#^ template.blocks.ng keyword.control.block.transition.ng
# ^^^ template.blocks.ng keyword.control.block.kind.ng
# ^^ template.blocks.ng keyword.control.block.kind.ng
# ^ template.blocks.ng
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
# ^^ template.blocks.ng control.block.ng control.block.expression.ng keyword.operator.comparison.ts
Expand All @@ -115,7 +123,8 @@
#^ template.blocks.ng control.block.ng punctuation.definition.block.ts
# ^ template.blocks.ng
# ^ template.blocks.ng keyword.control.block.transition.ng
# ^^^^^^^^ template.blocks.ng keyword.control.block.kind.ng
# ^^^^^^^ template.blocks.ng keyword.control.block.kind.ng
# ^ template.blocks.ng
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
# ^^ template.blocks.ng control.block.ng control.block.expression.ng keyword.operator.comparison.ts
Expand All @@ -131,7 +140,8 @@
>
>@for (let item of items; track $index) {
#^ template.blocks.ng keyword.control.block.transition.ng
# ^^^^ template.blocks.ng keyword.control.block.kind.ng
# ^^^ template.blocks.ng keyword.control.block.kind.ng
# ^ template.blocks.ng
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
# ^^^ template.blocks.ng control.block.ng control.block.expression.ng storage.type.ts
# ^ template.blocks.ng control.block.ng control.block.expression.ng
Expand All @@ -154,7 +164,8 @@
>
>@if (
#^ template.blocks.ng keyword.control.block.transition.ng
# ^^^ template.blocks.ng keyword.control.block.kind.ng
# ^^ template.blocks.ng keyword.control.block.kind.ng
# ^ template.blocks.ng
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
> items;
#^^^^ template.blocks.ng control.block.ng control.block.expression.ng
Expand Down Expand Up @@ -187,18 +198,75 @@
>}
#^ template.blocks.ng control.block.ng punctuation.definition.block.ts
>
><!-- Should not highlight -->
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ template.blocks.ng
>@if
#^^^^^ template.blocks.ng
#^ template.blocks.ng keyword.control.block.transition.ng
# ^^ template.blocks.ng keyword.control.block.kind.ng
# ^^ template.blocks.ng
>(items) {}
#^^^^^^^^^^^ template.blocks.ng
#^ template.blocks.ng control.block.ng meta.brace.round.ts
# ^^^^^ template.blocks.ng control.block.ng control.block.expression.ng variable.other.readwrite.ts
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
# ^ template.blocks.ng control.block.ng
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
>
>@for
#^ template.blocks.ng keyword.control.block.transition.ng
# ^^^ template.blocks.ng keyword.control.block.kind.ng
# ^^ template.blocks.ng
>(item of items; track $index) { }
#^ template.blocks.ng control.block.ng meta.brace.round.ts
# ^^^^ 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 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 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 meta.brace.round.ts
# ^ template.blocks.ng control.block.ng
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
# ^ template.blocks.ng control.block.ng control.block.body.ng
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
>
>@for (item of items; track $index) {
#^ template.blocks.ng keyword.control.block.transition.ng
# ^^^ template.blocks.ng keyword.control.block.kind.ng
# ^ template.blocks.ng
# ^ template.blocks.ng control.block.ng meta.brace.round.ts
# ^^^^ 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 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 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 meta.brace.round.ts
# ^ template.blocks.ng control.block.ng
# ^ template.blocks.ng control.block.ng punctuation.definition.block.ts
# ^^ template.blocks.ng control.block.ng control.block.body.ng
>
>}
#^ template.blocks.ng control.block.ng punctuation.definition.block.ts
# ^^ template.blocks.ng
>@empty
#^ template.blocks.ng keyword.control.block.transition.ng
# ^^^^^ template.blocks.ng keyword.control.block.kind.ng
# ^^ template.blocks.ng
>{
#^ template.blocks.ng control.block.ng punctuation.definition.block.ts
>
>}
#^ template.blocks.ng control.block.ng punctuation.definition.block.ts
>
><!-- Should not highlight -->
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ template.blocks.ng
>
>some.email@google.com ({}) {}
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ template.blocks.ng
>
>@for
#^^^^^^ template.blocks.ng
>(let item of items; track $index) { }
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ template.blocks.ng
>
Loading