Merge pull request #136 from nicolasstucki/fix-#135

Fix #135: Identify package names in extension clause

Author: MaximeKjaer

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'

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