From c44565664193b37f063319c8c1d3466de5ba8c4b Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 26 Jun 2020 21:21:39 +0200 Subject: [PATCH] Fix #84: Support with followed by a String literal --- src/typescript/Scala.tmLanguage.ts | 2 +- tests/unit/#84.test.scala | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 tests/unit/#84.test.scala diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts index 7d67e85..c8c1d88 100644 --- a/src/typescript/Scala.tmLanguage.ts +++ b/src/typescript/Scala.tmLanguage.ts @@ -935,7 +935,7 @@ export const scalaTmLanguage: TmLanguage = { inheritance: { patterns: [ { - match: '(extends|with|derives)\\s+([^\\s\\(\\{\\[\\]\\)\\};]+|(?=\\([^\\)]+=>))', + match: '(extends|with|derives)\\s+([^\\s\\(\\{\\[\\]\\)\\};"]+|(?=\\([^\\)]+=>)|(?="))', captures: { '1': { name: 'keyword.declaration.scala' diff --git a/tests/unit/#84.test.scala b/tests/unit/#84.test.scala new file mode 100644 index 0000000..6808af7 --- /dev/null +++ b/tests/unit/#84.test.scala @@ -0,0 +1,11 @@ +// SYNTAX TEST "source.scala" + + + Type[A with "user provided string" with B] +// ^ entity.name.class +// ^^^^ keyword.declaration.scala +// ^ string.quoted.double.scala punctuation.definition.string.begin.scala +// ^^^^^^^^^^^^^^^^^^^^ string.quoted.double.scala +// ^ string.quoted.double.scala punctuation.definition.string.end.scala +// ^^^^ keyword.declaration.scala +// ^ entity.other.inherited-class.scala