Skip to content
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

feat(fontlock): fontify ${} expressions inside backticks #177

Merged

Conversation

Fuco1
Copy link
Contributor

@Fuco1 Fuco1 commented Aug 8, 2022

Addresses #48 until better parser support is implemented.

This is an 80/20 approach so complex expressions inside the ${} are fontified as if a simple variable token. It probably can be improved in further iterations.

image

image

@josteink
Copy link
Member

This PR now has some slight conflicts with git master. Can you resolve those? 🙂

@Fuco1
Copy link
Contributor Author

Fuco1 commented Aug 15, 2022

Oh yea it's the test cases! Always a PITA. I'll fix it tomorrow.

@Fuco1 Fuco1 force-pushed the feature/fontify-backtick-expr branch from 7a4a15f to f3224c1 Compare June 1, 2024 15:41
@josteink josteink merged commit 5bb2944 into emacs-typescript:master Jun 3, 2024
16 of 21 checks passed
@Fuco1
Copy link
Contributor Author

Fuco1 commented Jun 3, 2024

My god I didn't even realize it took me two years to resolve the merge conflicts :D I was just updating my local typescript.el version and rebased this branch since it was what I was using.

Thanks for merging it!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants