Skip to content

Commit c445656

Browse files
committed
Fix scala#84: Support with followed by a String literal
1 parent 5f79e18 commit c445656

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

src/typescript/Scala.tmLanguage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ export const scalaTmLanguage: TmLanguage = {
935935
inheritance: {
936936
patterns: [
937937
{
938-
match: '(extends|with|derives)\\s+([^\\s\\(\\{\\[\\]\\)\\};]+|(?=\\([^\\)]+=>))',
938+
match: '(extends|with|derives)\\s+([^\\s\\(\\{\\[\\]\\)\\};"]+|(?=\\([^\\)]+=>)|(?="))',
939939
captures: {
940940
'1': {
941941
name: 'keyword.declaration.scala'

tests/unit/#84.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+
4+
Type[A with "user provided string" with B]
5+
// ^ entity.name.class
6+
// ^^^^ keyword.declaration.scala
7+
// ^ string.quoted.double.scala punctuation.definition.string.begin.scala
8+
// ^^^^^^^^^^^^^^^^^^^^ string.quoted.double.scala
9+
// ^ string.quoted.double.scala punctuation.definition.string.end.scala
10+
// ^^^^ keyword.declaration.scala
11+
// ^ entity.other.inherited-class.scala

0 commit comments

Comments
 (0)