Skip to content

Identify illegal $ tokens in string interpolators #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 24, 2021
Merged

Identify illegal $ tokens in string interpolators #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d3de7b
Identify illegal $ tokens in string interpolators
nicolasstucki Jan 29, 2021
b28000b
Highlight illegal $ as end of string
nicolasstucki Jan 29, 2021
e72b4c9
Improve highlighting strategy for illegal $
nicolasstucki Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions src/typescript/Scala.tmLanguage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ export const scalaTmLanguage: TmLanguage = {
},
{
begin: `\\b(raw)(""")`,
end: '"""(?!")',
end: `(""")(?!")|\\$\n|(\\$[^\\$"_{${letterChars}])`,
beginCaptures: {
'1': {
name: 'keyword.interpolation.scala'
Expand All @@ -356,14 +356,17 @@ export const scalaTmLanguage: TmLanguage = {
}
],
endCaptures: {
'0': {
'1': {
name: 'string.quoted.triple.interpolated.scala punctuation.definition.string.end.scala'
},
'2': {
name: 'invalid.illegal.unrecognized-string-escape.scala'
}
}
},
{
begin: `\\b(${alphaId})(""")`,
end: '"""(?!")',
end: `(""")(?!")|\\$\n|(\\$[^\\$"_{${letterChars}])`,
beginCaptures: {
'1': {
name: 'keyword.interpolation.scala'
Expand All @@ -386,8 +389,11 @@ export const scalaTmLanguage: TmLanguage = {
}
],
endCaptures: {
'0': {
'1': {
name: 'string.quoted.triple.interpolated.scala punctuation.definition.string.end.scala'
},
'2': {
name: 'invalid.illegal.unrecognized-string-escape.scala'
}
}
},
Expand Down Expand Up @@ -418,7 +424,7 @@ export const scalaTmLanguage: TmLanguage = {
},
{
begin: `\\b(raw)(")`,
end: '"',
end: `(")|\\$\n|(\\$[^\\$"_{${letterChars}])`,
beginCaptures: {
'1': {
name: 'keyword.interpolation.scala'
Expand All @@ -441,14 +447,17 @@ export const scalaTmLanguage: TmLanguage = {
}
],
endCaptures: {
'0': {
'1': {
name: 'string.quoted.double.interpolated.scala punctuation.definition.string.end.scala'
},
'2': {
name: 'invalid.illegal.unrecognized-string-escape.scala'
}
}
},
{
begin: `\\b(${alphaId})(")`,
end: '"',
end: `(")|\\$\n|(\\$[^\\$"_{${letterChars}])`,
beginCaptures: {
'1': {
name: 'keyword.interpolation.scala'
Expand All @@ -458,6 +467,10 @@ export const scalaTmLanguage: TmLanguage = {
}
},
patterns: [
{
match: "\\$[\\$\"]",
name: 'constant.character.escape.scala'
},
{
include: "#string-interpolation"
},
Expand All @@ -475,8 +488,11 @@ export const scalaTmLanguage: TmLanguage = {
}
],
endCaptures: {
'0': {
'1': {
name: 'string.quoted.double.interpolated.scala punctuation.definition.string.end.scala'
},
'2': {
name: 'invalid.illegal.unrecognized-string-escape.scala'
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion tests/unit/#183.test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// ^^ string.quoted.double.interpolated.scala
// ^^ - constant.character.escape.scala
// ^ punctuation.definition.string.end.scala

raw"$$ " // `$$` is an escaped `$` in raw interpolators
// ^^^ source.scala keyword.interpolation.scala
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
Expand Down Expand Up @@ -74,3 +74,8 @@
// ^ meta.template.expression.scala punctuation.definition.template-expression.end.scala
// ^ string.quoted.triple.interpolated.scala
// ^^^ punctuation.definition.string.end.scala

raw"$
// ^^^ source.scala keyword.interpolation.scala
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
// ^ - string.quoted.double.interpolated.scala punctuation.definition.string.end.scala
82 changes: 82 additions & 0 deletions tests/unit/#195.test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
// SYNTAX TEST "source.scala"

s"$a"
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
// ^ meta.template.expression.scala punctuation.definition.template-expression.begin.scala
// ^ meta.template.expression.scala
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.end.scala

s"${a}"
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
// ^^ meta.template.expression.scala punctuation.definition.template-expression.begin.scala
// ^ meta.template.expression.scala
// ^ meta.template.expression.scala punctuation.definition.template-expression.end.scala
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.end.scala

s"$_"
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
// ^ source.scala meta.template.expression.scala punctuation.definition.template-expression.begin.scala
// ^ source.scala meta.template.expression.scala
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.end.scala

s"$$"
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
// ^^ constant.character.escape.scala
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.end.scala

s"$""
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
// ^^ constant.character.escape.scala
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.end.scala


s"$
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
// ^ - string.quoted.double.interpolated.scala punctuation.definition.string.end.scala
// ^ - constant.character.escape.scala


s"$ //
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
// ^^ invalid.illegal.unrecognized-string-escape.scala

s"$++
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
// ^^ invalid.illegal.unrecognized-string-escape.scala
// ^ keyword.operator.arithmetic.scala

s"$; val a =
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
// ^^ invalid.illegal.unrecognized-string-escape.scala
// ^^^^^^^^ -string.quoted.double.interpolated.scala
// ^^^ keyword.declaration.stable.scala

raw"$
// ^^^ source.scala keyword.interpolation.scala
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
// ^ - string.quoted.double.interpolated.scala invalid.illegal.unrecognized-string-escape.scala

raw"$4
// ^^^ source.scala keyword.interpolation.scala
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
// ^^ invalid.illegal.unrecognized-string-escape.scala

raw"""$
// ^^^ source.scala keyword.interpolation.scala
// ^^^ string.quoted.triple.interpolated.scala punctuation.definition.string.begin.scala
// ^ - string.quoted.triple.interpolated.scala invalid.illegal.unrecognized-string-escape.scala

raw"""$8
// ^^^ source.scala keyword.interpolation.scala
// ^^^ string.quoted.triple.interpolated.scala punctuation.definition.string.begin.scala
// ^^ invalid.illegal.unrecognized-string-escape.scala

s"""$
// ^ source.scala keyword.interpolation.scala
// ^^^ string.quoted.triple.interpolated.scala punctuation.definition.string.begin.scala
// ^ - string.quoted.triple.interpolated.scala invalid.illegal.unrecognized-string-escape.scala

s"""$8
// ^ source.scala keyword.interpolation.scala
// ^^^ string.quoted.triple.interpolated.scala punctuation.definition.string.begin.scala
// ^^ invalid.illegal.unrecognized-string-escape.scala