Merge pull request #181 from nicolasstucki/fix-#180

Capture `using` followed by quote splice

Author: nicolasstucki

src/typescript/Scala.tmLanguage.ts

@@ -485,7 +485,7 @@ export const scalaTmLanguage: TmLanguage = {
     'using': {
       patterns: [
         {
-          match: `(?<=\\()\\s*(using)\\s+(?=[\\w\\d\\(\\.\\(\\{'"])`,
+          match: `(?<=\\()\\s*(using)\\s`,
           captures: {
             '1': {
               name: 'keyword.declaration.scala'

tests/unit/#180.test.scala

@@ -0,0 +1,7 @@
+// SYNTAX TEST "source.scala"
+
+   case '{ Array[T]()(using $ct) } =>
+//                    ^^^^^ keyword.declaration.scala
+
+   case '{ Array[T]()(using ($ct: ClassTag[T])) } =>
+//                    ^^^^^ keyword.declaration.scala

tests/unit/using.test.scala

@@ -41,4 +41,20 @@ given [T](using Ord[T]) as Ord[List[T]]
 
   f(using "")
 //  ^^^^^ keyword.declaration.scala
-//        ^^ string.quoted.double.scala
+//        ^^ string.quoted.double.scala
+
+  val using = ...
+//    ^^^^^ - keyword.declaration.scala
+  val using: X = ...
+//    ^^^^^ - keyword.declaration.scala
+  def using() = ...
+//    ^^^^^ - keyword.declaration.scala
+
+    using(foo)
+//  ^^^^^ - keyword.declaration.scala
+    bar(using(foo))
+//      ^^^^^ - keyword.declaration.scala
+  bar(using.apply(foo))
+//    ^^^^^ - keyword.declaration.scala
+    using.apply(foo)
+//  ^^^^^ - keyword.declaration.scala