diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts index 5e94b3b..c22b96c 100644 --- a/src/typescript/Scala.tmLanguage.ts +++ b/src/typescript/Scala.tmLanguage.ts @@ -418,7 +418,7 @@ export const scalaTmLanguage: TmLanguage = { }, { begin: `\\b(raw)(")`, - end: `(")|(\\$(?=[^\\$"_{${letterChars}]))`, + end: `"|\\$(?=[^\\$"_{${letterChars}])`, beginCaptures: { '1': { name: 'keyword.interpolation.scala' @@ -441,17 +441,14 @@ export const scalaTmLanguage: TmLanguage = { } ], endCaptures: { - '1': { + '0': { name: 'string.quoted.double.interpolated.scala punctuation.definition.string.end.scala' - }, - '2': { - name: 'invalid.illegal.unrecognized-string-escape.scala' } } }, { begin: `\\b(${alphaId})(")`, - end: `(")|(\\$(?=[^\\$"_{${letterChars}]))`, + end: `"|\\$(?=[^\\$"_{${letterChars}])`, beginCaptures: { '1': { name: 'keyword.interpolation.scala' @@ -482,11 +479,8 @@ export const scalaTmLanguage: TmLanguage = { } ], endCaptures: { - '1': { + '0': { name: 'string.quoted.double.interpolated.scala punctuation.definition.string.end.scala' - }, - '2': { - name: 'invalid.illegal.unrecognized-string-escape.scala' } } } diff --git a/tests/unit/#183.test.scala b/tests/unit/#183.test.scala index 6b0d29a..2952e57 100644 --- a/tests/unit/#183.test.scala +++ b/tests/unit/#183.test.scala @@ -78,4 +78,4 @@ raw"$ // ^^^ source.scala keyword.interpolation.scala // ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala -// ^ invalid.illegal.unrecognized-string-escape.scala +// ^ string.quoted.double.interpolated.scala punctuation.definition.string.end.scala diff --git a/tests/unit/#195.test.scala b/tests/unit/#195.test.scala index 4c9a185..56d302f 100644 --- a/tests/unit/#195.test.scala +++ b/tests/unit/#195.test.scala @@ -32,16 +32,16 @@ s"$ // // ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala -// ^ invalid.illegal.unrecognized-string-escape.scala +// ^ string.quoted.double.interpolated.scala punctuation.definition.string.end.scala // ^^ comment.line.double-slash.scala punctuation.definition.comment.scala s"$+ // ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala -// ^ invalid.illegal.unrecognized-string-escape.scala +// ^ string.quoted.double.interpolated.scala punctuation.definition.string.end.scala // ^ keyword.operator.arithmetic.scala s"$; val a = // ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala -// ^ invalid.illegal.unrecognized-string-escape.scala +// ^ string.quoted.double.interpolated.scala punctuation.definition.string.end.scala // ^^^^^^^^^^ -string.quoted.double.interpolated.scala // ^^^ keyword.declaration.stable.scala