Skip to content

Commit

Permalink
(fix) don't highlight $ in wrong places (#1637)
Browse files Browse the repository at this point in the history
in imports for example
  • Loading branch information
dummdidumm committed Sep 15, 2022
1 parent a19d732 commit 678e76d
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 2 deletions.
4 changes: 2 additions & 2 deletions packages/svelte-vscode/syntaxes/svelte.tmLanguage.src.yaml
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<script>
import './$types';
import '$lib/foo';
$bar;
</script>

{$bar}
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
>

0 comments on commit 678e76d

Please sign in to comment.