Remove $ as possible character in simple interpolated variable name #74
Conversation
tests/unit/#72.test.scala
Outdated
| // ^ punctuation.definition.string.begin.scala | ||
| // ^ punctuation.definition.template-expression.begin.scala | ||
| // ^^ punctuation.definition.template-expression.begin.scala | ||
| // ^^^^^^^^^^^^ punctuation.definition.template-expression.scala |
There was a problem hiding this comment.
This part should be parsed as an arbitrary Scala block. For example, it could contain definitions
val a = 4; foo(a)
s"$safeTagMarker${val a = 4; foo(a)}$safeTagMarker"Both val a = 4; foo(a) should have the same highlighting.
There was a problem hiding this comment.
Oh right I can see the foos have different highlighting here.
The issue is val a = 4; foo(a) has scope punctuation.definition.template-expression.scala inside string interpolation and since ; foo(a) has no scope it was highlighted the same way as ${ and } (punctuation.definition.template-expression.begin.scala and punctuation.definition.template-expression.end.scala).
I just pushed another commit to fix this. Basically replace punctuation.definition.template-expression.scala with meta.embedded.line.scala (Inspiration from typescript and ruby tm highlighting). More details in the commit message which I'm just gonna paste here.
Add scopes
meta.template.expression.scalaandmeta.embedded.line.scala
Eg. Ins"${val a = 4; foo(a)}",${val a = 4; foo(a)}will havemeta.template.expression.scalawhileval a = 4; foo(a)will havemeta.embedded.line.scala.
Earlierval a = 4; foo(a)was underpunctuation.definition.template-expression. This makes things without a scope like; foo(a)highlighted differently inside string interpolation (they will have the same highlighting as${and}) vs outside, which is not desirable.
Visual tests
Before
After
Before
After
Add scopes `meta.template.expression.scala` and `meta.embedded.line.scala`
Eg. In `s"${val a = 4; foo(a)}"`, `${val a = 4; foo(a)}` will have `meta.template.expression.scala` while `val a = 4; foo(a)` will have `meta.embedded.line.scala`.
Earlier `val a = 4; foo(a)` was under `punctuation.definition.template-expression`. This makes things without a scope like `; foo(a)` highlighted differently inside string interpolation (they will have the same highlighting as `${` and `}`) vs outside, which is not desireable.
|
Thank you @kiendang |
Fix #72
Before
After
