Skip to content

Commit b28000b

Browse files
committed
Highlight illegal $ as end of string
1 parent 6d3de7b commit b28000b

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

src/typescript/Scala.tmLanguage.ts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ export const scalaTmLanguage: TmLanguage = {
418418
},
419419
{
420420
begin: `\\b(raw)(")`,
421-
end: `(")|(\\$(?=[^\\$"_{${letterChars}]))`,
421+
end: `"|\\$(?=[^\\$"_{${letterChars}])`,
422422
beginCaptures: {
423423
'1': {
424424
name: 'keyword.interpolation.scala'
@@ -441,17 +441,14 @@ export const scalaTmLanguage: TmLanguage = {
441441
}
442442
],
443443
endCaptures: {
444-
'1': {
444+
'0': {
445445
name: 'string.quoted.double.interpolated.scala punctuation.definition.string.end.scala'
446-
},
447-
'2': {
448-
name: 'invalid.illegal.unrecognized-string-escape.scala'
449446
}
450447
}
451448
},
452449
{
453450
begin: `\\b(${alphaId})(")`,
454-
end: `(")|(\\$(?=[^\\$"_{${letterChars}]))`,
451+
end: `"|\\$(?=[^\\$"_{${letterChars}])`,
455452
beginCaptures: {
456453
'1': {
457454
name: 'keyword.interpolation.scala'
@@ -482,11 +479,8 @@ export const scalaTmLanguage: TmLanguage = {
482479
}
483480
],
484481
endCaptures: {
485-
'1': {
482+
'0': {
486483
name: 'string.quoted.double.interpolated.scala punctuation.definition.string.end.scala'
487-
},
488-
'2': {
489-
name: 'invalid.illegal.unrecognized-string-escape.scala'
490484
}
491485
}
492486
}

tests/unit/#183.test.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@
7878
raw"$
7979
// ^^^ source.scala keyword.interpolation.scala
8080
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
81-
// ^ invalid.illegal.unrecognized-string-escape.scala
81+
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.end.scala

tests/unit/#195.test.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@
3232

3333
s"$ //
3434
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
35-
// ^ invalid.illegal.unrecognized-string-escape.scala
35+
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.end.scala
3636
// ^^ comment.line.double-slash.scala punctuation.definition.comment.scala
3737

3838
s"$+
3939
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
40-
// ^ invalid.illegal.unrecognized-string-escape.scala
40+
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.end.scala
4141
// ^ keyword.operator.arithmetic.scala
4242

4343
s"$; val a =
4444
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
45-
// ^ invalid.illegal.unrecognized-string-escape.scala
45+
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.end.scala
4646
// ^^^^^^^^^^ -string.quoted.double.interpolated.scala
4747
// ^^^ keyword.declaration.stable.scala

0 commit comments

Comments
 (0)