Skip to content

Remove $ as possible character in simple interpolated variable name #74

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
Jan 27, 2020
Merged

Remove $ as possible character in simple interpolated variable name #74

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
9553c6e
Remove $ as possible character in simple interpolated variable name
kiendang Jan 11, 2020
1906813
Update string interpolation highlighting
kiendang Jan 27, 2020
9a3fb4f
Update .gitignore
kiendang Jan 27, 2020
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ node_modules

*.vsix
.metals
.vscode
9 changes: 6 additions & 3 deletions src/typescript/Scala.tmLanguage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ const letter = `[${letterChars}]`
const letterOrDigitChars = `${letterChars}0-9`
const letterOrDigit = `[${letterOrDigitChars}]`
const alphaId = `${letter}+`
const simpleInterpolatedVariable = `${letter}${letterOrDigit}*` // see SIP-11 https://docs.scala-lang.org/sips/string-interpolation.html
const letterOrDigitNoDollarSign = `[${letterOrDigit.replace("\\$", "")}]`
const simpleInterpolatedVariable = `${letter}${letterOrDigitNoDollarSign}*` // see SIP-11 https://docs.scala-lang.org/sips/string-interpolation.html
const opchar = `[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]`
const idrest = `${letter}${letterOrDigit}*(?:(?<=_)${opchar}+)?`
const idUpper = `${upperLetter}${letterOrDigit}*(?:(?<=_)${opchar}+)?`
Expand Down Expand Up @@ -326,6 +327,7 @@ export const scalaTmLanguage: TmLanguage = {
match: "\\$\\$"
},
{
name: "meta.template.expression.scala",
match: `(\\$)(${simpleInterpolatedVariable})`,
captures: {
"1": {
Expand All @@ -334,7 +336,7 @@ export const scalaTmLanguage: TmLanguage = {
}
},
{
name: "punctuation.definition.template-expression.scala",
name: "meta.template.expression.scala",
begin: "\\$\\{",
beginCaptures: { "0": { name: "punctuation.definition.template-expression.begin.scala" } },
end: "\\}",
Expand All @@ -343,7 +345,8 @@ export const scalaTmLanguage: TmLanguage = {
{
include: "#code"
}
]
],
contentName: "meta.embedded.line.scala"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion syntaxes/Scala.tmLanguage.json
View file
Open in desktop

Large diffs are not rendered by default.

80 changes: 40 additions & 40 deletions tests/snap/lexical.test.scala.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,90 +279,90 @@
#^^ source.scala
# ^ source.scala keyword.interpolation.scala
# ^ source.scala string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
# ^ source.scala punctuation.definition.template-expression.begin.scala
# ^ source.scala
# ^ source.scala meta.template.expression.scala punctuation.definition.template-expression.begin.scala
# ^ source.scala meta.template.expression.scala
# ^ source.scala string.quoted.double.interpolated.scala
# ^ source.scala string.quoted.double.interpolated.scala
# ^ source.scala string.quoted.double.interpolated.scala
# ^ source.scala string.quoted.double.interpolated.scala
# ^ source.scala string.quoted.double.interpolated.scala
# ^ source.scala string.quoted.double.interpolated.scala
# ^ source.scala string.quoted.double.interpolated.scala
# ^^ source.scala punctuation.definition.template-expression.scala punctuation.definition.template-expression.begin.scala
# ^^^ source.scala punctuation.definition.template-expression.scala keyword.declaration.stable.scala
# ^ source.scala punctuation.definition.template-expression.scala
# ^ source.scala punctuation.definition.template-expression.scala variable.other.declaration.scala
# ^ source.scala punctuation.definition.template-expression.scala
# ^ source.scala punctuation.definition.template-expression.scala keyword.operator.comparison.scala
# ^^ source.scala punctuation.definition.template-expression.scala
# ^ source.scala punctuation.definition.template-expression.scala punctuation.definition.template-expression.end.scala
# ^^ source.scala meta.template.expression.scala punctuation.definition.template-expression.begin.scala
# ^^^ source.scala meta.template.expression.scala meta.embedded.line.scala keyword.declaration.stable.scala
# ^ source.scala meta.template.expression.scala meta.embedded.line.scala
# ^ source.scala meta.template.expression.scala meta.embedded.line.scala variable.other.declaration.scala
# ^ source.scala meta.template.expression.scala meta.embedded.line.scala
# ^ source.scala meta.template.expression.scala meta.embedded.line.scala keyword.operator.comparison.scala
# ^^ source.scala meta.template.expression.scala meta.embedded.line.scala
# ^ source.scala meta.template.expression.scala punctuation.definition.template-expression.end.scala
# ^ source.scala string.quoted.double.interpolated.scala punctuation.definition.string.end.scala
> custom"$x plain ${val x = y}"
#^^ source.scala
# ^^^^^^ source.scala keyword.interpolation.scala
# ^ source.scala string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
# ^ source.scala punctuation.definition.template-expression.begin.scala
# ^ source.scala
# ^ source.scala meta.template.expression.scala punctuation.definition.template-expression.begin.scala
# ^ source.scala meta.template.expression.scala
# ^ source.scala string.quoted.double.interpolated.scala
# ^ source.scala string.quoted.double.interpolated.scala
# ^ source.scala string.quoted.double.interpolated.scala
# ^ source.scala string.quoted.double.interpolated.scala
# ^ source.scala string.quoted.double.interpolated.scala
# ^ source.scala string.quoted.double.interpolated.scala
# ^ source.scala string.quoted.double.interpolated.scala
# ^^ source.scala punctuation.definition.template-expression.scala punctuation.definition.template-expression.begin.scala
# ^^^ source.scala punctuation.definition.template-expression.scala keyword.declaration.stable.scala
# ^ source.scala punctuation.definition.template-expression.scala
# ^ source.scala punctuation.definition.template-expression.scala variable.other.declaration.scala
# ^ source.scala punctuation.definition.template-expression.scala
# ^ source.scala punctuation.definition.template-expression.scala keyword.operator.comparison.scala
# ^^ source.scala punctuation.definition.template-expression.scala
# ^ source.scala punctuation.definition.template-expression.scala punctuation.definition.template-expression.end.scala
# ^^ source.scala meta.template.expression.scala punctuation.definition.template-expression.begin.scala
# ^^^ source.scala meta.template.expression.scala meta.embedded.line.scala keyword.declaration.stable.scala
# ^ source.scala meta.template.expression.scala meta.embedded.line.scala
# ^ source.scala meta.template.expression.scala meta.embedded.line.scala variable.other.declaration.scala
# ^ source.scala meta.template.expression.scala meta.embedded.line.scala
# ^ source.scala meta.template.expression.scala meta.embedded.line.scala keyword.operator.comparison.scala
# ^^ source.scala meta.template.expression.scala meta.embedded.line.scala
# ^ source.scala meta.template.expression.scala punctuation.definition.template-expression.end.scala
# ^ source.scala string.quoted.double.interpolated.scala punctuation.definition.string.end.scala
>
> s"""$x plain ${val x = y}"""
#^^ source.scala
# ^ source.scala keyword.interpolation.scala
# ^^^ source.scala string.quoted.triple.interpolated.scala punctuation.definition.string.begin.scala
# ^ source.scala punctuation.definition.template-expression.begin.scala
# ^ source.scala
# ^ source.scala meta.template.expression.scala punctuation.definition.template-expression.begin.scala
# ^ source.scala meta.template.expression.scala
# ^ source.scala string.quoted.triple.interpolated.scala
# ^ source.scala string.quoted.triple.interpolated.scala
# ^ source.scala string.quoted.triple.interpolated.scala
# ^ source.scala string.quoted.triple.interpolated.scala
# ^ source.scala string.quoted.triple.interpolated.scala
# ^ source.scala string.quoted.triple.interpolated.scala
# ^ source.scala string.quoted.triple.interpolated.scala
# ^^ source.scala punctuation.definition.template-expression.scala punctuation.definition.template-expression.begin.scala
# ^^^ source.scala punctuation.definition.template-expression.scala keyword.declaration.stable.scala
# ^ source.scala punctuation.definition.template-expression.scala
# ^ source.scala punctuation.definition.template-expression.scala variable.other.declaration.scala
# ^ source.scala punctuation.definition.template-expression.scala
# ^ source.scala punctuation.definition.template-expression.scala keyword.operator.comparison.scala
# ^^ source.scala punctuation.definition.template-expression.scala
# ^ source.scala punctuation.definition.template-expression.scala punctuation.definition.template-expression.end.scala
# ^^ source.scala meta.template.expression.scala punctuation.definition.template-expression.begin.scala
# ^^^ source.scala meta.template.expression.scala meta.embedded.line.scala keyword.declaration.stable.scala
# ^ source.scala meta.template.expression.scala meta.embedded.line.scala
# ^ source.scala meta.template.expression.scala meta.embedded.line.scala variable.other.declaration.scala
# ^ source.scala meta.template.expression.scala meta.embedded.line.scala
# ^ source.scala meta.template.expression.scala meta.embedded.line.scala keyword.operator.comparison.scala
# ^^ source.scala meta.template.expression.scala meta.embedded.line.scala
# ^ source.scala meta.template.expression.scala punctuation.definition.template-expression.end.scala
# ^^^ source.scala string.quoted.triple.interpolated.scala punctuation.definition.string.end.scala
> custom"""$x plain ${val x = y}"""
#^^ source.scala
# ^^^^^^ source.scala keyword.interpolation.scala
# ^^^ source.scala string.quoted.triple.interpolated.scala punctuation.definition.string.begin.scala
# ^ source.scala punctuation.definition.template-expression.begin.scala
# ^ source.scala
# ^ source.scala meta.template.expression.scala punctuation.definition.template-expression.begin.scala
# ^ source.scala meta.template.expression.scala
# ^ source.scala string.quoted.triple.interpolated.scala
# ^ source.scala string.quoted.triple.interpolated.scala
# ^ source.scala string.quoted.triple.interpolated.scala
# ^ source.scala string.quoted.triple.interpolated.scala
# ^ source.scala string.quoted.triple.interpolated.scala
# ^ source.scala string.quoted.triple.interpolated.scala
# ^ source.scala string.quoted.triple.interpolated.scala
# ^^ source.scala punctuation.definition.template-expression.scala punctuation.definition.template-expression.begin.scala
# ^^^ source.scala punctuation.definition.template-expression.scala keyword.declaration.stable.scala
# ^ source.scala punctuation.definition.template-expression.scala
# ^ source.scala punctuation.definition.template-expression.scala variable.other.declaration.scala
# ^ source.scala punctuation.definition.template-expression.scala
# ^ source.scala punctuation.definition.template-expression.scala keyword.operator.comparison.scala
# ^^ source.scala punctuation.definition.template-expression.scala
# ^ source.scala punctuation.definition.template-expression.scala punctuation.definition.template-expression.end.scala
# ^^ source.scala meta.template.expression.scala punctuation.definition.template-expression.begin.scala
# ^^^ source.scala meta.template.expression.scala meta.embedded.line.scala keyword.declaration.stable.scala
# ^ source.scala meta.template.expression.scala meta.embedded.line.scala
# ^ source.scala meta.template.expression.scala meta.embedded.line.scala variable.other.declaration.scala
# ^ source.scala meta.template.expression.scala meta.embedded.line.scala
# ^ source.scala meta.template.expression.scala meta.embedded.line.scala keyword.operator.comparison.scala
# ^^ source.scala meta.template.expression.scala meta.embedded.line.scala
# ^ source.scala meta.template.expression.scala punctuation.definition.template-expression.end.scala
# ^^^ source.scala string.quoted.triple.interpolated.scala punctuation.definition.string.end.scala
>}
#^ source.scala punctuation.section.block.end.scala
Expand Down
16 changes: 8 additions & 8 deletions tests/unit/#71.test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@

s"1 + 2 = ${ 1 + { val x = 2; x } }."
// ^ keyword.interpolation.scala
// ^^^^^^^^^^^^^^^^^^^^^^^^^ meta.template.expression.scala
// ^ punctuation.definition.string.begin.scala
// ^^^^^^^^ string.quoted.double.interpolated.scala
// ^^ punctuation.definition.template-expression.begin.scala
// ^ punctuation.section.block.begin.scala
// ^ punctuation.section.block.end.scala
// ^^^^^^^^^^^^^^^^^^^^^^ punctuation.definition.template-expression.scala
// ^^^^^^^^^^^^^^^^^^^^^^ meta.embedded.line.scala
// ^ punctuation.definition.template-expression.end.scala
// ^ string.quoted.double.interpolated.scala
// ^ punctuation.definition.string.end.scala
Expand All @@ -16,18 +17,17 @@
// ^ keyword.interpolation.scala
// ^^^ punctuation.definition.string.begin.scala
// ^^^^^^^^ string.quoted.triple.interpolated.scala
// ^^ punctuation.definition.template-expression.begin.scala
// ^^ meta.template.expression.scala punctuation.definition.template-expression.begin.scala
def add(x: Int, y: Int) = {
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^ punctuation.definition.template-expression.scala
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.template.expression.scala meta.embedded.line.scala
// ^ punctuation.section.block.begin.scala
x + y
// ^^^^^ punctuation.definition.template-expression.scala
// ^^^^^ meta.template.expression.scala meta.embedded.line.scala
}
// ^ punctuation.section.block.end.scala
// ^ punctuation.definition.template-expression.scala
// ^ meta.template.expression.scala meta.embedded.line.scala punctuation.section.block.end.scala
add(1, 2)
// ^^^^^^^^^ punctuation.definition.template-expression.scala
// ^^^^^^^^^ meta.template.expression.scala meta.embedded.line.scala
}."""
// ^ punctuation.definition.template-expression.end.scala
// ^ meta.template.expression.scala punctuation.definition.template-expression.end.scala
// ^ string.quoted.triple.interpolated.scala
// ^^^ punctuation.definition.string.end.scala
43 changes: 43 additions & 0 deletions tests/unit/#72.test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
// SYNTAX TEST "source.scala"

s"$first$second"
// ^ keyword.interpolation.scala
// ^^^^^^^^^^^^^ meta.template.expression.scala
// ^ punctuation.definition.string.begin.scala
// ^ punctuation.definition.template-expression.begin.scala
// ^ punctuation.definition.template-expression.begin.scala
// ^ punctuation.definition.string.end.scala

s"$safeTagMarker${mtch.matched}$safeTagMarker"
// ^ keyword.interpolation.scala
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.template.expression.scala
// ^ punctuation.definition.string.begin.scala
// ^ punctuation.definition.template-expression.begin.scala
// ^^ punctuation.definition.template-expression.begin.scala
// ^^^^^^^^^^^^ meta.embedded.line.scala
// ^ punctuation.definition.template-expression.end.scala
// ^ punctuation.definition.template-expression.begin.scala
// ^ punctuation.definition.string.end.scala

s"${x$}"
// ^ keyword.interpolation.scala
// ^^^^^ meta.template.expression.scala
// ^ punctuation.definition.string.begin.scala
// ^^ punctuation.definition.template-expression.begin.scala
// ^^ meta.embedded.line.scala
// ^ punctuation.definition.template-expression.end.scala
// ^ punctuation.definition.string.end.scala

val a = 4; foo(a)
// ^^^ keyword.declaration.stable.scala
// ^ variable.other.declaration.scala
// ^ keyword.operator.comparison.scala
// ^ constant.numeric.scala
s"$safeTagMarker${val a = 4; foo(a)}$safeTagMarker"
// ^^^^^^^^^^^^^^^^^^^^ meta.template.expression.scala
// ^^^^^^^^^^^^^^^^^ meta.embedded.line.scala
// ^^^^^^^^^^^^^^^^^ - punctuation.definition.template-expression
// ^^^ keyword.declaration.stable.scala
// ^ variable.other.declaration.scala
// ^ keyword.operator.comparison.scala
// ^ constant.numeric.scala
Loading