Skip to content

(fix) don't highlight $ in wrong places #1637

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

Merged
merged 1 commit into from
Sep 15, 2022
Merged

(fix) don't highlight $ in wrong places #1637

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 packages/svelte-vscode/syntaxes/svelte.tmLanguage.src.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ injections:
patterns:
# Matches the store accessor symbol.
# i.e. the `$` in `$myStore`.
- match: (?<![_$[:alnum:]])\$(?=[_[:alpha:]][_$[:alnum:]]*)
- match: (?<![_$./'"[:alnum:]])\$(?=[_[:alpha:]][_$[:alnum:]]*)
name: punctuation.definition.variable.svelte
# Matches the built-in constants/keywords that Svelte supports.
# e.g. `$$restProps`.
- match: (?<![_$[:alnum:]])(\$\$)(?=props|restProps|slots)
- match: (?<![_$./'"[:alnum:]])(\$\$)(?=props|restProps|slots)
name: punctuation.definition.variable.svelte

# - PUG -
Expand Down
7 changes: 7 additions & 0 deletions packages/svelte-vscode/test/grammar/samples/store/input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<script>
import './$types';
import '$lib/foo';
$bar;
</script>

{$bar}
22 changes: 22 additions & 0 deletions packages/svelte-vscode/test/grammar/samples/store/input.svelte.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
><script>
#^ source.svelte meta.script.svelte meta.tag.start.svelte punctuation.definition.tag.begin.svelte
# ^^^^^^ source.svelte meta.script.svelte meta.tag.start.svelte entity.name.tag.svelte
# ^ source.svelte meta.script.svelte meta.tag.start.svelte punctuation.definition.tag.end.svelte
>import './$types';
#^^^^^^^^^^^^^^^^^^^ source.svelte meta.script.svelte meta.embedded.block.svelte source.js
>import '$lib/foo';
#^^^^^^^^^^^^^^^^^^^ source.svelte meta.script.svelte meta.embedded.block.svelte source.js
>$bar;
#^ source.svelte meta.script.svelte meta.embedded.block.svelte source.js punctuation.definition.variable.svelte
# ^^^^^ source.svelte meta.script.svelte meta.embedded.block.svelte source.js
></script>
#^^ source.svelte meta.script.svelte meta.tag.end.svelte punctuation.definition.tag.begin.svelte
# ^^^^^^ source.svelte meta.script.svelte meta.tag.end.svelte entity.name.tag.svelte
# ^ source.svelte meta.script.svelte meta.tag.end.svelte punctuation.definition.tag.end.svelte
>
>{$bar}
#^ source.svelte punctuation.section.embedded.begin.svelte
# ^ source.svelte meta.embedded.expression.svelte source.ts punctuation.definition.variable.svelte
# ^^^ source.svelte meta.embedded.expression.svelte source.ts
# ^ source.svelte punctuation.section.embedded.end.svelte
>