Skip to content

Fix highlighting for symbolic symbol literals #28

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.

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
May 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules

*.vsix
.metals
5 changes: 4 additions & 1 deletion src/typescript/Scala.tmLanguage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ 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
const opchar = `[!#%&*+\\-\\/:<>=?@^|~[\\p{Sm}\\p{So}]]`
const idrest = `${letter}(?:${letterOrDigit})*(?:((?<=_))${opchar}+)?`
const plainid = `(?:${idrest}|(?:${opchar})+)`

export const scalaTmLanguage: TmLanguage = {
fileTypes: [
Expand Down Expand Up @@ -601,7 +604,7 @@ export const scalaTmLanguage: TmLanguage = {
}
},
'scala-symbol': {
match: "'\\w+(?=[^'\\w]|$)",
match: `(?>'${plainid})(?!')`,
name: 'constant.other.symbol.scala'
},
'meta-brackets': {
Expand Down
2 changes: 1 addition & 1 deletion syntaxes/Scala.tmLanguage.json

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions tests/snap/lexical.test.scala.snap
Original file line number Diff line number Diff line change
Expand Up @@ -378,10 +378,9 @@
# ^^ source.scala
# ^^^^^^ source.scala constant.other.symbol.scala
# ^^ source.scala
# ^ source.scala constant.character.literal.scala punctuation.definition.character.begin.scala
# ^^^ source.scala constant.character.literal.scala invalid.illegal.character-literal-too-long
# ^ source.scala constant.character.literal.scala punctuation.definition.character.end.scala
# ^ source.scala keyword.operator.arithmetic.scala
# ^^ source.scala constant.other.symbol.scala
# ^^ source.scala
# ^^ source.scala constant.other.symbol.scala
# ^ source.scala
# ^ source.scala meta.bracket.scala
>}
Expand Down
37 changes: 37 additions & 0 deletions tests/unit/symbol.test.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// SYNTAX TEST "source.scala"

object Unicode {

val blue = '* //red
// ^ source.scala
// ^^ source.scala constant.other.symbol.scala
// ^ source.scala
val stillRed = '*
// ^^ source.scala constant.other.symbol.scala
val invalidSymbol = '**_x //'
// ^^^ source.scala constant.other.symbol.scala
// ^^^ source.scala
val symbolFollowedByOp = 'symbol*
// ^^^^^^^ source.scala constant.other.symbol.scala
// ^ source.scala keyword.operator.arithmetic.scala
val symbolEndedWithOp = 'symbol_*
// ^^^^^^^^^ source.scala constant.other.symbol.scala
val unclosedSymbol = '1 //'
// ^ source.scala constant.character.literal.scala punctuation.definition.character.begin.scala
// ^^^^ source.scala constant.character.literal.scala invalid.illegal.character-literal-too-long
// ^ source.scala constant.character.literal.scala punctuation.definition.character.end.scala
val symbolWithDigit = 'symbol1 //'
// ^^^^^^^^ source.scala constant.other.symbol.scala
val characterLit = 'x'
// ^ source.scala constant.character.literal.scala punctuation.definition.character.begin.scala
// ^ source.scala constant.character.literal.scala
// ^ source.scala constant.character.literal.scala punctuation.definition.character.end.scala
val greekSymbol = 'ξφδ
// ^^^^ source.scala constant.other.symbol.scala
val greekSymbolDigit = 'φδφ0
// ^^^^^ source.scala constant.other.symbol.scala
val greekSymbolWithOp = 'δφξφξ_+-
// ^^^^^^^^^ source.scala constant.other.symbol.scala
val multiOpSymbol = '***
// ^^^^ constant.other.symbol.scala
}