Skip to content

Commit f8dcd02

Browse files
committed
Simplify 'using' regex
1 parent e1277fd commit f8dcd02

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

src/typescript/Scala.tmLanguage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ export const scalaTmLanguage: TmLanguage = {
425425
'using': {
426426
patterns: [
427427
{
428-
match: `(?<=\\()\\s*(using)\\s+(?=[\\w\\d\\(\\.\\(\\{'"$])`,
428+
match: `(?<=\\()\\s*(using)\\s`,
429429
captures: {
430430
'1': {
431431
name: 'keyword.declaration.scala'

tests/unit/#180.test.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
// SYNTAX TEST "source.scala"
22

3-
case '{ Array[T]()(using $ct) =>
3+
case '{ Array[T]()(using $ct) } =>
4+
// ^^^^^ keyword.declaration.scala
5+
6+
case '{ Array[T]()(using ($ct: ClassTag[T])) } =>
47
// ^^^^^ keyword.declaration.scala

tests/unit/using.test.scala

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,20 @@ given [T](using Ord[T]) as Ord[List[T]]
4141

4242
f(using "")
4343
// ^^^^^ keyword.declaration.scala
44-
// ^^ string.quoted.double.scala
44+
// ^^ string.quoted.double.scala
45+
46+
val using = ...
47+
// ^^^^^ - keyword.declaration.scala
48+
val using: X = ...
49+
// ^^^^^ - keyword.declaration.scala
50+
def using() = ...
51+
// ^^^^^ - keyword.declaration.scala
52+
53+
using(foo)
54+
// ^^^^^ - keyword.declaration.scala
55+
bar(using(foo))
56+
// ^^^^^ - keyword.declaration.scala
57+
bar(using.apply(foo))
58+
// ^^^^^ - keyword.declaration.scala
59+
using.apply(foo)
60+
// ^^^^^ - keyword.declaration.scala

0 commit comments

Comments
 (0)