Merge pull request #74 from kiendang/dollar-sign

nicolasstucki · web-flow · commit 10e15a5e3c20 · 2020-01-27T07:40:43.000+01:00
Remove $ as possible character in simple interpolated variable name
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ node_modules
 
 *.vsix
 .metals
+.vscode
diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts
@@ -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}+)?`
@@ -326,6 +327,7 @@ export const scalaTmLanguage: TmLanguage = {
           match: "\\$\\$"
         },
         {
+          name: "meta.template.expression.scala",
           match: `(\\$)(${simpleInterpolatedVariable})`,
           captures: {
             "1": {
@@ -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: "\\}",
@@ -343,7 +345,8 @@ export const scalaTmLanguage: TmLanguage = {
                 {
                     include: "#code"
                 }
-            ]
+            ],
+            contentName: "meta.embedded.line.scala"
         }
       ]
     },
diff --git a/syntaxes/Scala.tmLanguage.json b/syntaxes/Scala.tmLanguage.json
diff --git a/tests/snap/lexical.test.scala.snap b/tests/snap/lexical.test.scala.snap
@@ -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
diff --git a/tests/unit/#71.test.scala b/tests/unit/#71.test.scala
@@ -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
@@ -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
diff --git a/tests/unit/#72.test.scala b/tests/unit/#72.test.scala
@@ -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
diff --git a/tests/unit/lexical.test.scala b/tests/unit/lexical.test.scala

Original file line number	Diff line number	Diff line change
`@@ -2,3 +2,4 @@ node_modules`
`2`	`2`
`3`	`3`	`*.vsix`
`4`	`4`	`.metals`
	`5`	`+.vscode`
Original file line number	Diff line number	Diff line change
@@ -10,7 +10,8 @@ const letter = `[${letterChars}]`
`10`	`10`	const letterOrDigitChars = `${letterChars}0-9`
`11`	`11`	const letterOrDigit = `[${letterOrDigitChars}]`
`12`	`12`	const alphaId = `${letter}+`
`13`		-const simpleInterpolatedVariable = `${letter}${letterOrDigit}*` // see SIP-11 https://docs.scala-lang.org/sips/string-interpolation.html
	`13`	+const letterOrDigitNoDollarSign = `[${letterOrDigit.replace("\\$", "")}]`
	`14`	+const simpleInterpolatedVariable = `${letter}${letterOrDigitNoDollarSign}*` // see SIP-11 https://docs.scala-lang.org/sips/string-interpolation.html
`14`	`15`	const opchar = `[!#%&*+\\-\\/:<>=?@^\|~\\p{Sm}\\p{So}]`
`15`	`16`	const idrest = `${letter}${letterOrDigit}*(?:(?<=_)${opchar}+)?`
`16`	`17`	const idUpper = `${upperLetter}${letterOrDigit}*(?:(?<=_)${opchar}+)?`
`@@ -326,6 +327,7 @@ export const scalaTmLanguage: TmLanguage = {`
`326`	`327`	`match: "\\$\\$"`
`327`	`328`	`},`
`328`	`329`	`{`
	`330`	`+ name: "meta.template.expression.scala",`
`329`	`331`	match: `(\\$)(${simpleInterpolatedVariable})`,
`330`	`332`	`captures: {`
`331`	`333`	`"1": {`
`@@ -334,7 +336,7 @@ export const scalaTmLanguage: TmLanguage = {`
`334`	`336`	`}`
`335`	`337`	`},`
`336`	`338`	`{`
`337`		`- name: "punctuation.definition.template-expression.scala",`
	`339`	`+ name: "meta.template.expression.scala",`
`338`	`340`	`begin: "\\$\\{",`
`339`	`341`	`beginCaptures: { "0": { name: "punctuation.definition.template-expression.begin.scala" } },`
`340`	`342`	`end: "\\}",`
`@@ -343,7 +345,8 @@ export const scalaTmLanguage: TmLanguage = {`
`343`	`345`	`{`
`344`	`346`	`include: "#code"`
`345`	`347`	`}`
`346`		`- ]`
	`348`	`+ ],`
	`349`	`+ contentName: "meta.embedded.line.scala"`
`347`	`350`	`}`
`348`	`351`	`]`
`349`	`352`	`},`