Skip to content

Commit

Permalink
Correct interpolated string region match
Browse files Browse the repository at this point in the history
  • Loading branch information
tobym committed Jul 22, 2013
1 parent fb8c2c1 commit 098bae3
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions syntax/scala.vim
Expand Up @@ -106,15 +106,17 @@ syn match scalaAnnotation "@[a-zA-Z]\+"
syn match scalaEmptyString "\"\""

" multi-line string literals
syn region scalaMultiLineString start="\"\"\"" end="\"\"\"\"\@!" contains=scalaUnicode,scalaInterpolation
syn region scalaMultiLineString start="\"\"\"" end="\"\"\"\"\@!" contains=scalaUnicode
syn match scalaUnicode "\\u[0-9a-fA-F]\{4}" contained

" string literals with escapes
syn region scalaString start="\"[^"]" skip="\\\"" end="\"" contains=scalaStringEscape,scalaInterpolation " TODO end \n or not?
syn region scalaString start="\"[^"]" skip="\\\"" end="\"" contains=scalaStringEscape " TODO end \n or not?
syn match scalaStringEscape "\\u[0-9a-fA-F]\{4}" contained
syn match scalaStringEscape "\\[nrfvb\\\"]" contained

" string interpolation
syn region scalaInterpolatedString start="s\"[^"]" skip="\\\"" end="\"" contains=scalaStringEscape,scalaInterpolation " TODO end \n or not?
syn region scalaInterpolatedMultiLineString start="s\"\"\"" end="\"\"\"\"\@!" contains=scalaUnicode,scalaInterpolation
syn region scalaInterpolation matchgroup=scalaInterpolationDelimiter start="${" end="}" contained contains=ALLBUT,scalaXmlEscape,scalaFqnSet

" symbol and character literals
Expand Down Expand Up @@ -153,6 +155,8 @@ hi link scalaOperator Normal
hi link scalaNumber Number
hi link scalaEmptyString String
hi link scalaString String
hi link scalaInterpolatedString String
hi link scalaInterpolatedMultiLineString String
hi link scalaChar String
hi link scalaMultiLineString String
hi link scalaStringEscape Special
Expand Down

0 comments on commit 098bae3

Please sign in to comment.