Skip to content

Add regex for interpolator identifier #223

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 1 commit into from
Nov 8, 2021
Merged

Add regex for interpolator identifier #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/typescript/Scala.tmLanguage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const idrest = `${letter}${letterOrDigit}*(?:(?<=_)${opchar}+)?`
const idUpper = `${upperLetter}${letterOrDigit}*(?:(?<=_)${opchar}+)?`
const idLower = `${lowerLetter}${letterOrDigit}*(?:(?<=_)${opchar}+)?`
const plainid = `(?:${idrest}|${opchar}+)`
const interpolatorid = `(?:${letter}${letterOrDigit}*(?:(?<=_)${opchar}+)?)`
const backQuotedId = "`[^`]+`"
const anyId = `(?:${plainid}|${backQuotedId})`
const endOfLineMaybeWithComment = "(?=\\s*(//.*|/\\*(?!.*\\*/\\s*\\S.*).*)?$)"
Expand Down Expand Up @@ -365,7 +366,7 @@ export const scalaTmLanguage: TmLanguage = {
}
},
{
begin: `\\b(${alphaId})(""")`,
begin: `\\b(${interpolatorid})(""")`,
end: `(""")(?!")|\\$\n|(\\$[^\\$"_{${letterChars}])`,
beginCaptures: {
'1': {
Expand Down Expand Up @@ -456,7 +457,7 @@ export const scalaTmLanguage: TmLanguage = {
}
},
{
begin: `\\b(${alphaId})(")`,
begin: `\\b(${interpolatorid})(")`,
end: `(")|\\$\n|(\\$[^\\$"_{${letterChars}])`,
beginCaptures: {
'1': {
Expand Down
33 changes: 33 additions & 0 deletions tests/unit/#222.test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// SYNTAX TEST "source.scala"

test"hello $name"
// ^^^^ keyword.interpolation.scala
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
// ^^^^^^ string.quoted.double.interpolated.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

test1"hello $name"
// ^^^^^ keyword.interpolation.scala
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
// ^^^^^^ string.quoted.double.interpolated.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

test1a"hello $name"
// ^^^^^^ keyword.interpolation.scala
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
// ^^^^^^ string.quoted.double.interpolated.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

test_+"hello $name"
// ^^^^^^ keyword.interpolation.scala
// ^ string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala
// ^^^^^^ string.quoted.double.interpolated.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