Skip to content

Commit e42a751

Browse files
committed
Improve JavaScript syntax inside curly brackets in the template
1 parent 08df884 commit e42a751

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

syntax/svelte-html.vim

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ syntax region svelteExpression
3636
\ start="{"
3737
\ end="}\(}\|;\)\@!"
3838

39-
" Multiple lines expressions are supposed to end with '}}'
39+
" Multiple lines expressions are supposed to end with '}}' or ')}'
4040
syntax region svelteExpression
4141
\ containedin=svelteValue,htmlValue,htmlAttr
4242
\ contains=@simpleJavascriptExpression
4343
\ matchgroup=svelteBrace
4444
\ start="{"
45-
\ end="\(}\)\@<=}"
45+
\ end="\(}\)\@<=}\|\()\)\@<=}"
4646

4747
syntax region svelteExpression
4848
\ containedin=htmlSvelteTemplate,svelteValue,htmlString,htmlArg,htmlTag,htmlAttr,htmlValue,htmlAttr
@@ -78,7 +78,7 @@ syntax region svelteBlockEnd
7878
syntax keyword svelteBlockKeyword if else each await then catch as
7979

8080
syntax cluster simpleJavascriptExpression
81-
\ contains=javaScriptStringS,javaScriptStringD,javaScriptTemplateString,javascriptNumber,javaScriptOperator
81+
\ contains=javaScript.*
8282

8383
" Redefine JavaScript syntax
8484
syntax region javaScriptStringS
@@ -92,13 +92,6 @@ syntax region javaScriptTemplateExpression
9292
\ matchgroup=Type
9393
\ start=+${+ end=+}+ keepend contained
9494

95-
syntax match javaScriptNumber '\v<-?\d+L?>|0[xX][0-9a-fA-F]+>' contained
96-
syntax match javaScriptOperator '[-!|&+<>=%*~^]' contained
97-
syntax match javaScriptOperator '\v(*)@<!/(/|*)@!' contained
98-
syntax keyword javaScriptOperator contained
99-
\ delete instanceof typeof void new in of const let var
100-
\ return function
101-
10295
highlight default link svelteAttr htmlTag
10396
if s:highlight_svelte_attr
10497
highlight default link svelteKey Type

0 commit comments

Comments
 (0)