Skip to content
This repository was archived by the owner on Jan 3, 2019. It is now read-only.

Conversation

@cmbankester
Copy link
Contributor

  • Color template string interpolation punctuation red
  • Unset string color for contents of template string interpolation

* Color template string interpolation punctuation red
* Unset string color for contents of template string interpolation
@cmbankester cmbankester changed the title Added interpolated template string syntax coloring Added Javascript ES6 interpolated template string syntax coloring Aug 14, 2015
@cmbankester cmbankester changed the title Added Javascript ES6 interpolated template string syntax coloring Added Javascript interpolated template string syntax coloring Aug 14, 2015
@schmty
Copy link
Contributor

schmty commented Aug 14, 2015

Could you show some before and after screenshots?

@cmbankester
Copy link
Contributor Author

Before:
screen shot 2015-08-14 at 5 50 56 pm

After:
screen shot 2015-08-14 at 5 51 51 pm

@cmbankester
Copy link
Contributor Author

Looks like I made a mistake with the selector:
screen shot 2015-08-14 at 5 55 19 pm
(the ending semicolon and function-body closing bracket are red).

I'll fix that as soon as I can.

@schmty
Copy link
Contributor

schmty commented Aug 14, 2015

@cbankester alright. Looks good! Once you fix this ping me and we will get this pulled in 👍

@cmbankester
Copy link
Contributor Author

I fixed the selector issue, but uncovered a bug in atom/language-javascript that causes the closing bracket of a non-empty function body inside template string interpolation to be marked-up as the closing bracket of the interpolation. See, e.g.:
screen shot 2015-08-15 at 10 35 48 pm

I'll be opening an issue or pull request on that package soon, but as far as I'm aware, the styles here are correct now.

@schmty
Copy link
Contributor

schmty commented Aug 17, 2015

Nice work @cbankester I will say that I would probably prefer for the language-javascript issue to be resolved first though

@cmbankester
Copy link
Contributor Author

Agreed. I poked around their source, but it's quite convoluted. I'll keep y'all updated on if a fix lands.

@schmty
Copy link
Contributor

schmty commented Aug 18, 2015

Awesome. Looking forward to getting this pulled in!

@schmty
Copy link
Contributor

schmty commented Aug 18, 2015

@cbankester I have filed an issue on the atom/language-javascript repo.
atom/language-javascript#199

@schmty
Copy link
Contributor

schmty commented Nov 8, 2015

@cbankester atom/language-javascript#199 has been resolved. I will take care of merging this in now! 👍

schmty added a commit that referenced this pull request Nov 8, 2015
Added Javascript interpolated template string syntax coloring
@schmty schmty merged commit b3ea1da into atom:master Nov 8, 2015
@nstepien
Copy link

@schmittyjd @cmbankester
Looks like it regressed at some point.
image

Nevermind it's just that atom hasn't published solarized v0.40

@cmbankester cmbankester deleted the patch-1 branch January 15, 2016 16:23
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants