diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts index 2e4a1fd..e7bcc26 100644 --- a/src/typescript/Scala.tmLanguage.ts +++ b/src/typescript/Scala.tmLanguage.ts @@ -565,12 +565,6 @@ export const scalaTmLanguage: TmLanguage = { { match: '(<-|←|->|→|=>|⇒|\\?|\\:+|@|\\|)+', name: 'keyword.operator.scala' - }, - { - match: '\\s(as)\\s', - captures: { - '1': { name: 'keyword.declaration.scala' } - } } ] }, diff --git a/tests/unit/#103.test.scala b/tests/unit/#103.test.scala index df54789..2d0ffba 100644 --- a/tests/unit/#103.test.scala +++ b/tests/unit/#103.test.scala @@ -2,19 +2,19 @@ given as Foo = ... // ^^^^^ keyword.declaration.scala -// ^^ keyword.declaration.scala +// ^^ - keyword.declaration.scala given foo as Foo = ... // ^^^^^ keyword.declaration.scala // ^^^ entity.name.declaration -// ^^ keyword.declaration.scala +// ^^ - keyword.declaration.scala given (x: X) as Foo = ... // ^^^^^ keyword.declaration.scala // ^ variable.parameter.scala // ^ meta.colon.scala // ^ entity.name.class -// ^^ keyword.declaration.scala +// ^^ - keyword.declaration.scala given [X](x: X) as Foo = ... // ^^^^^ keyword.declaration.scala @@ -22,7 +22,7 @@ // ^ variable.parameter.scala // ^ meta.colon.scala // ^ entity.name.class -// ^^ keyword.declaration.scala +// ^^ - keyword.declaration.scala given foo(x: A) as Foo = ... // ^^^^^ keyword.declaration.scala @@ -30,7 +30,7 @@ // ^ variable.parameter.scala // ^ meta.colon.scala // ^ entity.name.class -// ^^ keyword.declaration.scala +// ^^ - keyword.declaration.scala given foo[X](x: X) as Foo = ... // ^^^^^ keyword.declaration.scala @@ -39,7 +39,7 @@ // ^ variable.parameter.scala // ^ meta.colon.scala // ^ entity.name.class -// ^^ keyword.declaration.scala +// ^^ - keyword.declaration.scala given foo[X <: Y { type A = 1; def f(using a: Int): 2 }](x: X = 2) as Foo = ... // ^^^^^ keyword.declaration.scala @@ -73,7 +73,7 @@ // ^^ punctuation.definition.comment.scala // ^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.double-slash.scala as Foo -// ^^ keyword.declaration.scala +// ^^ - keyword.declaration.scala given// this should be a comment // ^^^^^ keyword.declaration.scala diff --git a/tests/unit/given.test.scala b/tests/unit/given.test.scala index e3d5956..a0e1518 100644 --- a/tests/unit/given.test.scala +++ b/tests/unit/given.test.scala @@ -13,24 +13,24 @@ given as Foo = ??? // ^^^^^ keyword.declaration.scala -// ^^ keyword.declaration.scala +// ^^ - keyword.declaration.scala // ^^^ entity.name.class given as foo = ??? // ^^^^^ keyword.declaration.scala -// ^^ keyword.declaration.scala +// ^^ - keyword.declaration.scala // ^^^ source.scala given bar as foo = ??? // ^^^^^ keyword.declaration.scala // ^^^ entity.name.declaration -// ^^ keyword.declaration.scala +// ^^ - keyword.declaration.scala // ^^^ source.scala given Foo as foo = ??? // ^^^^^ keyword.declaration.scala // ^^^ entity.name.type.declaration -// ^^ keyword.declaration.scala +// ^^ - keyword.declaration.scala // ^^^ source.scala given foo = ???; given Bar as Baz @@ -38,7 +38,7 @@ // ^^^ - entity.name.type.declaration // ^^^^^ keyword.declaration.scala // ^^^ entity.name.type.declaration -// ^^ keyword.declaration.scala +// ^^ - keyword.declaration.scala // ^^^ entity.name.class given Foo = ???; given Bar as Baz @@ -47,5 +47,5 @@ // ^^^ entity.name.class // ^^^^^ keyword.declaration.scala // ^^^ entity.name.type.declaration -// ^^ keyword.declaration.scala +// ^^ - keyword.declaration.scala // ^^^ entity.name.class