Fix scala#124: Identify extended class names as identifiers

Author: nicolasstucki

src/typescript/Scala.tmLanguage.ts

@@ -988,7 +988,7 @@ export const scalaTmLanguage: TmLanguage = {
     inheritance: {
       patterns: [
         {
-          match: '(extends|with|derives)\\s+([^\\s\\(\\{\\[\\]\\)\\};"]+|(?=\\([^\\)]+=>)|(?="))',
+          match: `(extends|with|derives)\\s+(${plainid}|${backQuotedId}|(?=\\([^\\)]+=>)|(?="))`,
           captures: {
             '1': {
               name: 'keyword.declaration.scala'

tests/unit/#124.test.scala

@@ -0,0 +1,65 @@
+// SYNTAX TEST "source.scala"
+
+def foo(x: A with B, c: C): Int = 0
+//           ^^^^ keyword.declaration.scala
+//                ^ entity.other.inherited-class.scala
+//                 ^ source.scala
+
+class B extends A with B,
+//                ^^^^ keyword.declaration.scala
+//                     ^ entity.other.inherited-class.scala
+//                      ^ source.scala
+  
+class B extends A with B:
+//                ^^^^ keyword.declaration.scala
+//                     ^ entity.other.inherited-class.scala
+//                      ^ source.scala
+
+class B extends A:
+//      ^^^^^^^ keyword.declaration.scala
+//              ^ entity.other.inherited-class.scala
+//               ^ source.scala
+
+class B extends A,
+//      ^^^^^^^ keyword.declaration.scala
+//              ^ entity.other.inherited-class.scala
+//               ^ source.scala
+
+class B extends A'
+//      ^^^^^^^ keyword.declaration.scala
+//              ^ entity.other.inherited-class.scala
+//               ^ punctuation.definition.character.begin.scala
+
+class B extends A|
+//      ^^^^^^^ keyword.declaration.scala
+//              ^ entity.other.inherited-class.scala
+//               ^ source.scala
+
+class B extends A+
+//      ^^^^^^^ keyword.declaration.scala
+//              ^ entity.other.inherited-class.scala
+//               ^ source.scala
+
+class B extends A-
+//      ^^^^^^^ keyword.declaration.scala
+//              ^ entity.other.inherited-class.scala
+//               ^ source.scala
+
+class B extends A*
+//      ^^^^^^^ keyword.declaration.scala
+//              ^ entity.other.inherited-class.scala
+//               ^ source.scala
+
+class B extends A&
+//      ^^^^^^^ keyword.declaration.scala
+//              ^ entity.other.inherited-class.scala
+//               ^ source.scala
+
+class B extends A^
+//      ^^^^^^^ keyword.declaration.scala
+//              ^ entity.other.inherited-class.scala
+//               ^ source.scala
+
+class B extends `A`
+//      ^^^^^^^ keyword.declaration.scala
+//              ^^^ entity.other.inherited-class.scala