Skip to content

Commit 666c463

Browse files
committed
Fix #55: Add given imports syntax
Highlight the `given` in imports as a keyword and names as type entities. * As implemented in scala/scala3#7210 * Also fixes scala/scala3#7233
1 parent 505de8e commit 666c463

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

src/typescript/Scala.tmLanguage.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ export const scalaTmLanguage: TmLanguage = {
4949
{
5050
include: '#comments'
5151
},
52+
{
53+
match: `(given)(?=\\s)`,
54+
name: 'keyword.given.import.scala'
55+
},
5256
{
5357
match: `(${backQuotedId}|${plainid})`,
5458
name: 'entity.name.import.scala'
@@ -80,6 +84,17 @@ export const scalaTmLanguage: TmLanguage = {
8084
}
8185
}
8286
},
87+
{
88+
match: `(given)(\\s+${plainid})?(?=\\s*[,}])`,
89+
captures: {
90+
'1': {
91+
name: 'keyword.given.import.scala'
92+
},
93+
'2': {
94+
name: 'entity.name.type.import.scala'
95+
}
96+
}
97+
},
8398
{
8499
match: '([^\\s.,}]+)',
85100
name: 'entity.name.import.scala'

0 commit comments

Comments
 (0)