Skip to content

Commit d557cc4

Browse files
committed
Fix #140: Identify nameless given declarations
1 parent 076a74a commit d557cc4

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

src/typescript/Scala.tmLanguage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ export const scalaTmLanguage: TmLanguage = {
708708
name: 'meta.package.scala'
709709
},
710710
{
711-
match: `\\b(given)\\b\\s*(?:\\b(as)\\b|(${idUpper})|(${backQuotedId}|(?!//|/\\*)${plainid})?)`,
711+
match: `\\b(given)\\b\\s*(?:\\b(as)\\b|(${idUpper})(?=.+\\bas\\b)|(${backQuotedId}(?=.+\\bas\\b)|(?!//|/\\*)${plainid}(?=.+\\bas\\b))?)`,
712712
captures: {
713713
'1': { name: 'keyword.declaration.scala' },
714714
'2': { name: 'keyword.declaration.scala' },

tests/unit/#140.test.scala

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// SYNTAX TEST "source.scala"
2+
3+
given foo.Foo
4+
// ^^^^^ keyword.declaration.scala
5+
// ^^^ - entity.name.declaration
6+
// ^^^ entity.name.class
7+
8+
given Foo[a]
9+
// ^^^^^ keyword.declaration.scala
10+
// ^^^ - entity.name.type.declaration
11+
// ^^^ entity.name.class

tests/unit/given.test.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
given Foo = ???
55
// ^^^^^ keyword.declaration.scala
6-
// ^^^ entity.name.type.declaration
6+
// ^^^ - entity.name.type.declaration
77

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

1212
given as Foo = ???
1313
// ^^^^^ keyword.declaration.scala

0 commit comments

Comments
 (0)