summaryrefslogtreecommitdiffstats
path: root/syntax/scala.vim
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2016-05-31 01:53:12 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2016-05-31 01:53:12 +0200
commit44b3d860cb85ccb4edd52fb0dcf6a4102d12e82a (patch)
tree537e871f1d923c01c3d5098fd2958c198d093977 /syntax/scala.vim
parent5a65ffe66d19da9989ae6b71962830ca6c80f5b5 (diff)
downloadvim-polyglot-44b3d860cb85ccb4edd52fb0dcf6a4102d12e82a.tar.gz
vim-polyglot-44b3d860cb85ccb4edd52fb0dcf6a4102d12e82a.zip
Updatev2.9.1
Diffstat (limited to 'syntax/scala.vim')
-rw-r--r--syntax/scala.vim6
1 files changed, 3 insertions, 3 deletions
diff --git a/syntax/scala.vim b/syntax/scala.vim
index f8e2dd98..5e12b999 100644
--- a/syntax/scala.vim
+++ b/syntax/scala.vim
@@ -132,7 +132,7 @@ hi link scalaKeywordModifier Function
syn keyword scalaSpecial this true false ne eq
syn keyword scalaSpecial new nextgroup=scalaInstanceDeclaration skipwhite
syn match scalaSpecial "\%(=>\|⇒\|<-\|←\|->\|→\)"
-syn match scalaSpecial /`[^`]*`/ " Backtick literals
+syn match scalaSpecial /`[^`]\+`/ " Backtick literals
hi link scalaSpecial PreProc
syn keyword scalaExternal package import
@@ -188,8 +188,8 @@ hi link scalaTypeAnnotationParameter Function
syn match scalaShebang "\%^#!.*" display
syn region scalaMultilineComment start="/\*" end="\*/" contains=scalaMultilineComment,scalaDocLinks,scalaParameterAnnotation,scalaCommentAnnotation,scalaTodo,scalaCommentCodeBlock,@Spell keepend fold
syn match scalaCommentAnnotation "@[_A-Za-z0-9$]\+" contained
-syn match scalaParameterAnnotation "@param" nextgroup=scalaParamAnnotationValue skipwhite contained
-syn match scalaParamAnnotationValue /[`_A-Za-z0-9$]\+/ contained
+syn match scalaParameterAnnotation "\%(@tparam\|@param\|@see\)" nextgroup=scalaParamAnnotationValue skipwhite contained
+syn match scalaParamAnnotationValue /[.`_A-Za-z0-9$]\+/ contained
syn region scalaDocLinks start="\[\[" end="\]\]" contained
syn region scalaCommentCodeBlock matchgroup=Keyword start="{{{" end="}}}" contained
syn match scalaTodo "\vTODO|FIXME|XXX" contained