aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax/scala.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-11-06 05:26:57 +0100
committerJustin M. Keyes <justinkz@gmail.com>2017-11-06 05:35:32 +0100
commitc348f84f218434580209a2c52552ba8fbbf1864b (patch)
tree23aa73c016b3f3941917605cd1742dfe8ca7e1fd /runtime/syntax/scala.vim
parent93fb7383a330f03bf64ed5558a8e16ea4c742478 (diff)
downloadrneovim-c348f84f218434580209a2c52552ba8fbbf1864b.tar.gz
rneovim-c348f84f218434580209a2c52552ba8fbbf1864b.tar.bz2
rneovim-c348f84f218434580209a2c52552ba8fbbf1864b.zip
vim-patch:036986f1507d
Update runtime files. https://github.com/vim/vim/commit/036986f1507d223549d110af300144468bd3a1f7
Diffstat (limited to 'runtime/syntax/scala.vim')
-rw-r--r--runtime/syntax/scala.vim4
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