summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--syntax/kotlin.vim6
-rw-r--r--syntax/scala.vim2
2 files changed, 5 insertions, 3 deletions
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index e8828417..6797d4cf 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
" Vim syntax file
" Language: Kotlin
" Maintainer: Alexander Udalov
-" Latest Revision: 7 December 2015
+" Latest Revision: 23 December 2015
if exists("b:current_syntax")
finish
@@ -23,7 +23,8 @@ syn keyword ktInclude import package
syn keyword ktType Any Boolean Byte Char Double Float Int Long Nothing Short Unit
syn keyword ktModifier annotation companion enum inner internal private protected public abstract final open override sealed vararg dynamic
syn keyword ktStructure class object interface fun val var constructor init
-syn keyword ktTypedef typealias
+
+syn keyword ktReservedKeyword async typealias typeof yield
syn keyword ktBoolean true false
syn keyword ktConstant null
@@ -67,6 +68,7 @@ hi link ktRepeat Repeat
hi link ktOperator Operator
hi link ktKeyword Keyword
hi link ktException Exception
+hi link ktReservedKeyword Error
hi link ktInclude Include
diff --git a/syntax/scala.vim b/syntax/scala.vim
index 674c57c4..32d54e85 100644
--- a/syntax/scala.vim
+++ b/syntax/scala.vim
@@ -179,7 +179,7 @@ hi link scalaTypeOperator Keyword
hi link scalaTypeAnnotationParameter Function
syn match scalaShebang "\%^#!.*" display
-syn region scalaMultilineComment start="/\*" end="\*/" contains=scalaMultilineComment,scalaDocLinks,scalaParameterAnnotation,scalaCommentAnnotation,scalaTodo,scalaCommentCodeBlock,@scalaHtml,@Spell keepend
+syn region scalaMultilineComment start="/\*" end="\*/" contains=scalaMultilineComment,scalaDocLinks,scalaParameterAnnotation,scalaCommentAnnotation,scalaTodo,scalaCommentCodeBlock,@scalaHtml,@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