diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-11-06 20:23:35 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-11-06 20:23:35 +0300 |
| commit | 24a353364d6d186d528009fd0bb603d87183cf35 (patch) | |
| tree | a4070dc00731475d6bbdd3c84e61806b33802f7a /runtime/syntax/scala.vim | |
| parent | f2660bee6aca35be3d0ddb1d225784476c13cd27 (diff) | |
| parent | 946c2a8ee85830c543e389724575ae531e89b170 (diff) | |
| download | rneovim-24a353364d6d186d528009fd0bb603d87183cf35.tar.gz rneovim-24a353364d6d186d528009fd0bb603d87183cf35.tar.bz2 rneovim-24a353364d6d186d528009fd0bb603d87183cf35.zip | |
Merge branch 'master' into expression-parser
Diffstat (limited to 'runtime/syntax/scala.vim')
| -rw-r--r-- | runtime/syntax/scala.vim | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/syntax/scala.vim b/runtime/syntax/scala.vim index 7779c43996..c5a175fd77 100644 --- a/runtime/syntax/scala.vim +++ b/runtime/syntax/scala.vim @@ -71,6 +71,8 @@ hi link scalaUnicodeChar Special syn match scalaOperator "||" syn match scalaOperator "&&" +syn match scalaOperator "|" +syn match scalaOperator "&" hi link scalaOperator Special syn match scalaNameDefinition /\<[_A-Za-z0-9$]\+\>/ contained nextgroup=scalaPostNameDefinition,scalaVariableDeclarationList @@ -142,7 +144,7 @@ hi link scalaString String hi link scalaStringEmbeddedQuote String syn region scalaIString matchgroup=scalaInterpolationBrackets start=/\<[a-zA-Z][a-zA-Z0-9_]*"/ skip=/\\"/ end=/"/ contains=scalaInterpolation,scalaInterpolationB,scalaEscapedChar,scalaUnicodeChar -syn region scalaTripleIString matchgroup=scalaInterpolationBrackets start=/\<[a-zA-Z][a-zA-Z0-9_]*"""/ end=/"""\%([^"]\|$\)/ contains=scalaInterpolation,scalaInterpolationB,scalaEscapedChar,scalaUnicodeChar +syn region scalaTripleIString matchgroup=scalaInterpolationBrackets start=/\<[a-zA-Z][a-zA-Z0-9_]*"""/ end=/"""\ze\%([^"]\|$\)/ contains=scalaInterpolation,scalaInterpolationB,scalaEscapedChar,scalaUnicodeChar hi link scalaIString String hi link scalaTripleIString String |