Skip to content

Commit e549d19

Browse files
authored
fix(syntax): don't let comments inside <template> swallow the file (#3137)
The default template-content injection selector excluded `meta source` but not `comment`, so it also matched while the tokenizer was inside an HTML comment. Any `>` followed by whitespace inside a comment, such as `<div>` on its own line, made the injection begin again there, and the new instance's `end: (?=</template)` shadowed the comment's `end: -->`. The comment then never closed, and `</template>` was scoped as part of it. Excluding `comment` from the selector keeps the injection from re-beginning inside a comment. The comment closes normally and the content after it is still highlighted, which the added sample covers. Fixes #2663
1 parent af7c6a5 commit e549d19

3 files changed

Lines changed: 36 additions & 1 deletion

File tree

‎packages/svelte-vscode/syntaxes/svelte.tmLanguage.src.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ injections:
8888
contentName: text.pug, patterns: [{ include: text.pug }]}]
8989

9090
# Default (just introduces a new scope)
91-
'L:meta.template.svelte - meta.lang - (meta source)':
91+
'L:meta.template.svelte - meta.lang - (meta source | comment)':
9292
patterns: [{begin: '(?<=>)\s', end: '(?=</template)', patterns: [{ include: '#scope' }]}]
9393

9494
# ---- LANGUAGE EXTENSIONS
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<template>
2+
<!--<div>
3+
<p>A paragraph.</p>
4+
</div>-->
5+
<span>after the comment</span>
6+
</template>
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# SYNTAX TEST "source.svelte" "autogenerated snapshot test"
2+
><template>
3+
#^ source.svelte meta.template.svelte meta.tag.start.svelte punctuation.definition.tag.begin.svelte
4+
# ^^^^^^^^ source.svelte meta.template.svelte meta.tag.start.svelte entity.name.tag.svelte
5+
# ^ source.svelte meta.template.svelte meta.tag.start.svelte punctuation.definition.tag.end.svelte
6+
> <!--<div>
7+
#^^^^ source.svelte meta.template.svelte
8+
# ^^^^ source.svelte meta.template.svelte comment.block.svelte punctuation.definition.comment.svelte
9+
# ^^^^^^ source.svelte meta.template.svelte comment.block.svelte
10+
> <p>A paragraph.</p>
11+
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.svelte meta.template.svelte comment.block.svelte
12+
> </div>-->
13+
#^^^^^^^^^^ source.svelte meta.template.svelte comment.block.svelte
14+
# ^^^ source.svelte meta.template.svelte comment.block.svelte punctuation.definition.comment.svelte
15+
> <span>after the comment</span>
16+
#^^^^ source.svelte meta.template.svelte
17+
# ^ source.svelte meta.template.svelte meta.scope.tag.span.svelte meta.tag.start.svelte punctuation.definition.tag.begin.svelte
18+
# ^^^^ source.svelte meta.template.svelte meta.scope.tag.span.svelte meta.tag.start.svelte entity.name.tag.svelte
19+
# ^ source.svelte meta.template.svelte meta.scope.tag.span.svelte meta.tag.start.svelte punctuation.definition.tag.end.svelte
20+
# ^^^^^^^^^^^^^^^^^ source.svelte meta.template.svelte text.svelte
21+
# ^^ source.svelte meta.template.svelte meta.scope.tag.span.svelte meta.tag.end.svelte punctuation.definition.tag.begin.svelte
22+
# ^^^^ source.svelte meta.template.svelte meta.scope.tag.span.svelte meta.tag.end.svelte entity.name.tag.svelte
23+
# ^ source.svelte meta.template.svelte meta.scope.tag.span.svelte meta.tag.end.svelte punctuation.definition.tag.end.svelte
24+
></template>
25+
#^^ source.svelte meta.template.svelte meta.tag.end.svelte punctuation.definition.tag.begin.svelte
26+
# ^^^^^^^^ source.svelte meta.template.svelte meta.tag.end.svelte entity.name.tag.svelte
27+
# ^ source.svelte meta.template.svelte meta.tag.end.svelte punctuation.definition.tag.end.svelte
28+
>
29+
#^ source.svelte text.svelte

0 commit comments

Comments
 (0)