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.

Sign up for GitHub

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

CS1 tagged template literals (and CS2 interpolated strings as template literals) #4352

Merged
merged 34 commits into from
Nov 18, 2016
Merged

CS1 tagged template literals (and CS2 interpolated strings as template literals) #4352

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
4930ff1
Add initial support for template literals with no
greghuc Nov 5, 2016
60f64a5
Change ‘unexpected string’ error message tests to
greghuc Nov 6, 2016
772171f
Test tagged template literals for non-interpolated
greghuc Nov 6, 2016
94f14b5
Tagged template literals work for pure Strings.
greghuc Nov 6, 2016
bd2d499
Readying for StringWithInterpolations work.
greghuc Nov 6, 2016
bf8c5ef
Tweaks.
greghuc Nov 6, 2016
85d1039
Fix style
GeoffreyBooth Nov 7, 2016
3e20728
Merge branch 'master' of github.com:jashkenas/coffeescript into tagge…
GeoffreyBooth Nov 7, 2016
9301274
Merge branch 'tagged-template-literals' of https://github.com/Geoffre…
greghuc Nov 12, 2016
16b37fa
Pass StringWithInterpolations parameter straight
greghuc Nov 12, 2016
51a496c
Strip down compileNode for StringWithInterpolations
greghuc Nov 12, 2016
601c7a3
Done StringLiteral case for interpolated Strings
greghuc Nov 12, 2016
ec2ac5e
Remove need for TemplateLiteral
greghuc Nov 12, 2016
76d4629
Simplify code.
greghuc Nov 12, 2016
9a28519
Small code tidy
greghuc Nov 12, 2016
2c3374f
Interpolated strings now outputting as template literals.
greghuc Nov 12, 2016
577444d
Merge branch 'master' of github.com:jashkenas/coffeescript into tagge…
GeoffreyBooth Nov 12, 2016
e8d2019
Move error message tests into error_messages.coffee; remove test that…
GeoffreyBooth Nov 13, 2016
93a5e54
Split up tests that were testing multiple things per test, so that ea…
GeoffreyBooth Nov 13, 2016
c87b4db
Edge cases: tagged template literals containing interpolated strings …
GeoffreyBooth Nov 13, 2016
b1f9388
Make more concise, more idiomatic style
GeoffreyBooth Nov 13, 2016
60819a1
Pull back extreme indentation
GeoffreyBooth Nov 13, 2016
3aa69fc
Restore and fix commented-out tests
GeoffreyBooth Nov 13, 2016
7248694
Edge case: tagged template literal with empty string
GeoffreyBooth Nov 13, 2016
fe280ae
Only use new ES2015 interpolated string syntax if we’re inside a tagg…
GeoffreyBooth Nov 13, 2016
41d1631
Compiler now _doesn’t_ use template literals.
greghuc Nov 13, 2016
101ee35
Expand tagged template literal tests
greghuc Nov 13, 2016
0f1b1f4
Move ‘Unexpected string’ error message tests into
greghuc Nov 13, 2016
254d9b1
Don’t unwrap StringWithInterpolations.
greghuc Nov 13, 2016
a3976f8
No need to bracket interpolated strings any more.
greghuc Nov 13, 2016
ee0e4a7
Show html templating with tagged template literals
greghuc Nov 13, 2016
ee8f983
Multiline should match multiline
GeoffreyBooth Nov 13, 2016
ecfe6c5
Comment out unnecessary `unwrap`, which is only needed for CoffeeScri…
GeoffreyBooth Nov 14, 2016
9bae435
Merge branch 'master' into tagged-template-literals
GeoffreyBooth Nov 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/coffee-script/grammar.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 34 additions & 1 deletion lib/coffee-script/nodes.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading