Update interpolation syntaxes

aspeddro · Jul 7, 2021 · c5f4fb1 · c5f4fb1
1 parent 284d508
commit c5f4fb1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/examples/rescript-project/src/interpolationSyntax.res b/examples/rescript-project/src/interpolationSyntax.res
@@ -2,4 +2,10 @@ let name = "Amirali"
 
 let var = `hello ${name} how you doin?`
 
+let var2 = j`hello ${name} how you doin?`
+
+let var3 = j`hello $name how you doin?`
+
+let varInvalid = `hello $name how you doin?`
+
 let expr = `2 + 2 is ${Int.toString(2 + 2)}`
diff --git a/syntax/rescript.vim b/syntax/rescript.vim
@@ -82,9 +82,11 @@ syntax match resUnicodeChar "\v\\u[A-Fa-f0-9]\{4}" contained
 syntax match resEscapedChar "\v\\[\\"'ntbrf]" contained
 syntax region resString start="\v\"" end="\v\"" contains=resEscapedQuote,resEscapedChar,resUnicodeChar
 
+" Interpolation
+syntax match resInterpolationVariable "\v\$[a-z_][A-Za-z0-0_'$]*" contained
 syntax region resInterpolationBlock matchgroup=resInterpolationDelimiters start="\v\$\{" end="\v\}" contained contains=TOP
 syntax region resString start="\v`" end="\v`" contains=resInterpolationBlock
-syntax region resString start="\v[a-z]`" end="\v`" contains=resInterpolationBlock
+syntax region resString start="\v[a-z]`" end="\v`" contains=resInterpolationBlock,resInterpolationVariable
 
 " Polymorphic variants
 syntax match resPolyVariant "\v#[A-za-z][A-Za-z0-9_'$]*"
@@ -110,6 +112,7 @@ highlight default link resUnicodeChar Character
 highlight default link resEscapedChar Character
 highlight default link resString String
 highlight default link resInterpolationDelimiters Macro
+highlight default link resInterpolationVariable Macro
 highlight default link resAttribute PreProc
 
 let b:current_syntax = "rescript"