Fix #84: Support with followed by a String literal

scala · Jun 29, 2020 · c445656 · c445656
1 parent 5f79e18
commit c445656
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git 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
@@ -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