diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-11-06 11:22:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-06 11:22:55 +0100 |
| commit | 946c2a8ee85830c543e389724575ae531e89b170 (patch) | |
| tree | 23aa73c016b3f3941917605cd1742dfe8ca7e1fd /runtime/syntax/scala.vim | |
| parent | 8f03014e8861df7f49bf4e1dbdfcc20e1611ce35 (diff) | |
| parent | c348f84f218434580209a2c52552ba8fbbf1864b (diff) | |
| download | rneovim-946c2a8ee85830c543e389724575ae531e89b170.tar.gz rneovim-946c2a8ee85830c543e389724575ae531e89b170.tar.bz2 rneovim-946c2a8ee85830c543e389724575ae531e89b170.zip | |
Merge #7491 'vim-patch: runtime'
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 |