From c8aecd9efb89778e3be363e23cb533d357861e06 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 21 Aug 2020 17:29:03 +0200 Subject: [PATCH] Fix #135: Idnetify package names in extension clause --- src/typescript/Scala.tmLanguage.ts | 2 +- tests/unit/#135.test.scala | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 tests/unit/#135.test.scala diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts index 7a4656a..642689c 100644 --- a/src/typescript/Scala.tmLanguage.ts +++ b/src/typescript/Scala.tmLanguage.ts @@ -993,7 +993,7 @@ export const scalaTmLanguage: TmLanguage = { inheritance: { patterns: [ { - match: `(extends|with|derives)\\s+(${plainid}|${backQuotedId}|(?=\\([^\\)]+=>)|(?="))`, + match: `(extends|with|derives)\\s+(${idUpper}|${backQuotedId}|(?=\\([^\\)]+=>)|(?=${plainid})|(?="))`, captures: { '1': { name: 'keyword.declaration.scala' diff --git a/tests/unit/#135.test.scala b/tests/unit/#135.test.scala new file mode 100644 index 0000000..4ad1d78 --- /dev/null +++ b/tests/unit/#135.test.scala @@ -0,0 +1,12 @@ +// SYNTAX TEST "source.scala" + + class Foo extends scala.collection.Seq[Int] +// ^^^^^ keyword.declaration.scala +// ^^^ entity.name.class.declaration +// ^^^^^^^ keyword.declaration.scala +// ^^^^^ source.scala +// ^^^^^^^^^^ source.scala +// ^^^ entity.name.class +// ^ meta.bracket.scala +// ^^^ entity.name.class +// ^ meta.bracket.scala