diff --git a/syntax/scala.vim b/syntax/scala.vim index bb0fe0a..f99e24b 100644 --- a/syntax/scala.vim +++ b/syntax/scala.vim @@ -180,7 +180,7 @@ hi link scalaNumber Number syn region scalaRoundBrackets start="(" end=")" skipwhite contained contains=scalaTypeDeclaration,scalaSquareBrackets,scalaRoundBrackets -syn region scalaSquareBrackets matchgroup=scalaSquareBracketsBrackets start="\[" end="\]" skipwhite nextgroup=scalaTypeExtension contains=scalaTypeDeclaration,scalaSquareBrackets,scalaTypeOperator,scalaTypeAnnotationParameter +syn region scalaSquareBrackets matchgroup=scalaSquareBracketsBrackets start="\[" end="\]" skipwhite nextgroup=scalaTypeExtension contains=scalaTypeDeclaration,scalaSquareBrackets,scalaTypeOperator,scalaTypeAnnotationParameter,scalaString syn match scalaTypeOperator /[-+=:<>]\+/ contained syn match scalaTypeAnnotationParameter /@\<[`_A-Za-z0-9$]\+\>/ contained hi link scalaSquareBracketsBrackets Type diff --git a/syntax/testfile.scala b/syntax/testfile.scala index 1790c6f..44815f3 100644 --- a/syntax/testfile.scala +++ b/syntax/testfile.scala @@ -171,6 +171,8 @@ class ScalaClass(i: Int = 12, b: Trait[A, Trait[B, C]]) extends B with SomeTrait def someFunc[A <: B, X =:= Y] + func["(singleton"] + val soManyEscapes = "\\\"\u0031\n\b\r\f\t" // and a comment val soManyEscapes = """\\\"\u0031\n\b\r\f\t""" // and a comment val soManyEscapes = s"\\\"\u0031\n\b\r\f\t" // and a comment