Skip to content

Add string interpolation highlighting #24

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 4 commits into from
May 14, 2019
Merged

Add string interpolation highlighting #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
925245c
Add string interpolation highlighting
PanAeon May 8, 2019
e007203
string interpolation - correct variable name to match sem. meaning, d…
PanAeon May 9, 2019
a4fb9a0
generalize string interpolation to processed strings, i.e. <id>"..."
PanAeon May 9, 2019
6453d96
Review fixes, add missing scope to the interpolated string's quotes
PanAeon May 13, 2019
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
98 changes: 98 additions & 0 deletions src/typescript/Scala.tmLanguage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
"use strict";
import { TmLanguage } from "./TMLanguageModel";

const letter = "[_a-zA-Z\\$\\p{Lo}\\p{Lt}\\p{Nl}\\p{Ll}\\p{Lu}]"
const digit = "[0-9]"
const letterOrDigit = `${letter}|${digit}`
const alphaId = `${letter}+`
const simpleInterpolatedVariable = `${letter}(?:${letterOrDigit})*` // see SIP-11 https://docs.scala-lang.org/sips/string-interpolation.html

export const scalaTmLanguage: TmLanguage = {
fileTypes: [
'scala'
Expand Down Expand Up @@ -217,6 +223,36 @@ export const scalaTmLanguage: TmLanguage = {
},
name: 'string.quoted.triple.scala'
},
{
begin: `\\b(${alphaId})(""")`,
end: '"""(?!")',
beginCaptures: {
'1': {
name: 'keyword.interpolation.scala'
},
'2': {
name: 'string.quoted.triple.interpolated.scala punctuation.definition.string.begin.scala'
}
},
patterns: [
{
"include": "#string-interpolation"
},
{
match: '\\\\\\\\|\\\\u[0-9A-Fa-f]{4}',
name: 'constant.character.escape.scala'
},
{
match: '.',
name: 'string.quoted.triple.interpolated.scala'
}
],
endCaptures: {
'0': {
name: 'string.quoted.triple.interpolated.scala punctuation.definition.string.end.scala'
}
}
},
{
end: '"',
begin: '"',
Expand All @@ -241,6 +277,68 @@ export const scalaTmLanguage: TmLanguage = {
}
},
name: 'string.quoted.double.scala'
},
{
begin: `\\b(${alphaId})(")`,
end: '"',
beginCaptures: {
'1': {
name: 'keyword.interpolation.scala'
},
'2': {
name: 'string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala'
}
},
patterns: [
{
include: "#string-interpolation"
},
{
match: `\\\\(?:[btnfr\\\\"']|[0-7]{1,3}|u[0-9A-Fa-f]{4})`,
name: 'constant.character.escape.scala'
},
{
match: '\\\\.',
name: 'invalid.illegal.unrecognized-string-escape.scala'
},
{
match: '.',
name: 'string.quoted.double.interpolated.scala'
}
],
endCaptures: {
'0': {
name: 'string.quoted.double.interpolated.scala punctuation.definition.string.end.scala'
}
}
}
]
},
'string-interpolation': {
patterns: [
{
name: "constant.character.escape.interpolation.scala",
match: "\\$\\$"
},
{
match: `(\\$)(${simpleInterpolatedVariable})`,
captures: {
"1": {
name: "punctuation.definition.template-expression.begin.scala"
}
}
},
{
name: "punctuation.definition.template-expression.scala",
begin: "\\$\\{",
beginCaptures: { "0": { name: "punctuation.definition.template-expression.begin.scala" } },
end: "\\}",
endCaptures: { "0": { name: "punctuation.definition.template-expression.end.scala" } },
patterns: [
{
include: "#code"
}
]
}
]
},
Expand Down
Loading