Simplify 'using' regex

scala · Jan 18, 2021 · f8dcd02 · f8dcd02
1 parent e1277fd
commit f8dcd02
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts
@@ -425,7 +425,7 @@ export const scalaTmLanguage: TmLanguage = {
     'using': {
       patterns: [
         {
-          match: `(?<=\\()\\s*(using)\\s+(?=[\\w\\d\\(\\.\\(\\{'"$])`,
+          match: `(?<=\\()\\s*(using)\\s`,
           captures: {
             '1': {
               name: 'keyword.declaration.scala'

diff --git a/tests/unit/#180.test.scala b/tests/unit/#180.test.scala
@@ -1,4 +1,7 @@
 // SYNTAX TEST "source.scala"
 
-   case '{ Array[T]()(using $ct) =>
+   case '{ Array[T]()(using $ct) } =>
+//                    ^^^^^ keyword.declaration.scala
+
+   case '{ Array[T]()(using ($ct: ClassTag[T])) } =>
 //                    ^^^^^ keyword.declaration.scala
diff --git a/tests/unit/using.test.scala b/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