Skip to content

Commit a838344

Browse files
committed
Remove as syntax
1 parent 933611f commit a838344

File tree

3 files changed

+13
-19
lines changed

3 files changed

+13
-19
lines changed

src/typescript/Scala.tmLanguage.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -565,12 +565,6 @@ export const scalaTmLanguage: TmLanguage = {
565565
{
566566
match: '(<-|←|->|→|=>|⇒|\\?|\\:+|@|\\|)+',
567567
name: 'keyword.operator.scala'
568-
},
569-
{
570-
match: '\\s(as)\\s',
571-
captures: {
572-
'1': { name: 'keyword.declaration.scala' }
573-
}
574568
}
575569
]
576570
},

tests/unit/#103.test.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@
22

33
given as Foo = ...
44
// ^^^^^ keyword.declaration.scala
5-
// ^^ keyword.declaration.scala
5+
// ^^ - keyword.declaration.scala
66

77
given foo as Foo = ...
88
// ^^^^^ keyword.declaration.scala
99
// ^^^ entity.name.declaration
10-
// ^^ keyword.declaration.scala
10+
// ^^ - keyword.declaration.scala
1111

1212
given (x: X) as Foo = ...
1313
// ^^^^^ keyword.declaration.scala
1414
// ^ variable.parameter.scala
1515
// ^ meta.colon.scala
1616
// ^ entity.name.class
17-
// ^^ keyword.declaration.scala
17+
// ^^ - keyword.declaration.scala
1818

1919
given [X](x: X) as Foo = ...
2020
// ^^^^^ keyword.declaration.scala
2121
// ^ entity.name.class
2222
// ^ variable.parameter.scala
2323
// ^ meta.colon.scala
2424
// ^ entity.name.class
25-
// ^^ keyword.declaration.scala
25+
// ^^ - keyword.declaration.scala
2626

2727
given foo(x: A) as Foo = ...
2828
// ^^^^^ keyword.declaration.scala
2929
// ^^^ entity.name.declaration
3030
// ^ variable.parameter.scala
3131
// ^ meta.colon.scala
3232
// ^ entity.name.class
33-
// ^^ keyword.declaration.scala
33+
// ^^ - keyword.declaration.scala
3434

3535
given foo[X](x: X) as Foo = ...
3636
// ^^^^^ keyword.declaration.scala
@@ -39,7 +39,7 @@
3939
// ^ variable.parameter.scala
4040
// ^ meta.colon.scala
4141
// ^ entity.name.class
42-
// ^^ keyword.declaration.scala
42+
// ^^ - keyword.declaration.scala
4343

4444
given foo[X <: Y { type A = 1; def f(using a: Int): 2 }](x: X = 2) as Foo = ...
4545
// ^^^^^ keyword.declaration.scala
@@ -73,7 +73,7 @@
7373
// ^^ punctuation.definition.comment.scala
7474
// ^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.double-slash.scala
7575
as Foo
76-
// ^^ keyword.declaration.scala
76+
// ^^ - keyword.declaration.scala
7777

7878
given// this should be a comment
7979
// ^^^^^ keyword.declaration.scala

tests/unit/given.test.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,32 @@
1313

1414
given as Foo = ???
1515
// ^^^^^ keyword.declaration.scala
16-
// ^^ keyword.declaration.scala
16+
// ^^ - keyword.declaration.scala
1717
// ^^^ entity.name.class
1818

1919
given as foo = ???
2020
// ^^^^^ keyword.declaration.scala
21-
// ^^ keyword.declaration.scala
21+
// ^^ - keyword.declaration.scala
2222
// ^^^ source.scala
2323

2424
given bar as foo = ???
2525
// ^^^^^ keyword.declaration.scala
2626
// ^^^ entity.name.declaration
27-
// ^^ keyword.declaration.scala
27+
// ^^ - keyword.declaration.scala
2828
// ^^^ source.scala
2929

3030
given Foo as foo = ???
3131
// ^^^^^ keyword.declaration.scala
3232
// ^^^ entity.name.type.declaration
33-
// ^^ keyword.declaration.scala
33+
// ^^ - keyword.declaration.scala
3434
// ^^^ source.scala
3535

3636
given foo = ???; given Bar as Baz
3737
// ^^^^^ keyword.declaration.scala
3838
// ^^^ - entity.name.type.declaration
3939
// ^^^^^ keyword.declaration.scala
4040
// ^^^ entity.name.type.declaration
41-
// ^^ keyword.declaration.scala
41+
// ^^ - keyword.declaration.scala
4242
// ^^^ entity.name.class
4343

4444
given Foo = ???; given Bar as Baz
@@ -47,5 +47,5 @@
4747
// ^^^ entity.name.class
4848
// ^^^^^ keyword.declaration.scala
4949
// ^^^ entity.name.type.declaration
50-
// ^^ keyword.declaration.scala
50+
// ^^ - keyword.declaration.scala
5151
// ^^^ entity.name.class

0 commit comments

Comments
 (0)