Skip to content

Commit 6453d96

Browse files
committed
Review fixes, add missing scope to the interpolated string's quotes
1 parent a4fb9a0 commit 6453d96

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

src/typescript/Scala.tmLanguage.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ import { TmLanguage } from "./TMLanguageModel";
44
const letter = "[_a-zA-Z\\$\\p{Lo}\\p{Lt}\\p{Nl}\\p{Ll}\\p{Lu}]"
55
const digit = "[0-9]"
66
const letterOrDigit = `${letter}|${digit}`
7-
const opchar = `[!#%&*+\\-\\/:<>=?@\\\\^|~[\\p{Sm}\\p{So}]]`
8-
const op = `${opchar}+`
9-
const idrest = `${letter}(?:${letterOrDigit})*(?:_${op})?`
107
const alphaId = `${letter}+`
118
const simpleInterpolatedVariable = `${letter}(?:${letterOrDigit})*` // see SIP-11 https://docs.scala-lang.org/sips/string-interpolation.html
129

@@ -234,7 +231,7 @@ export const scalaTmLanguage: TmLanguage = {
234231
name: 'keyword.interpolation.scala'
235232
},
236233
'2': {
237-
name: 'punctuation.definition.string.begin.scala'
234+
name: 'string.quoted.triple.interpolated.scala punctuation.definition.string.begin.scala'
238235
}
239236
},
240237
patterns: [
@@ -252,7 +249,7 @@ export const scalaTmLanguage: TmLanguage = {
252249
],
253250
endCaptures: {
254251
'0': {
255-
name: 'punctuation.definition.string.end.scala'
252+
name: 'string.quoted.triple.interpolated.scala punctuation.definition.string.end.scala'
256253
}
257254
}
258255
},
@@ -289,7 +286,7 @@ export const scalaTmLanguage: TmLanguage = {
289286
name: 'keyword.interpolation.scala'
290287
},
291288
'2': {
292-
name: 'punctuation.definition.string.begin.scala'
289+
name: 'string.quoted.double.interpolated.scala punctuation.definition.string.begin.scala'
293290
}
294291
},
295292
patterns: [
@@ -311,7 +308,7 @@ export const scalaTmLanguage: TmLanguage = {
311308
],
312309
endCaptures: {
313310
'0': {
314-
name: 'punctuation.definition.string.end.scala'
311+
name: 'string.quoted.double.interpolated.scala punctuation.definition.string.end.scala'
315312
}
316313
}
317314
}

0 commit comments

Comments
 (0)