[CS2] merge master post-#4585

[helixbass]

@GeoffreyBooth here's 2 with post-#4585 master merged. The test case in #4585 needed to be updated due to the grammar changes introduced by #4493 (object spread)

I wasn't sure how to resolve the merge conflict in documentation/sections/introduction.md - I deleted the "CoffeeScript 2 is coming..." conflict line b/c we're on 2 here but not sure how documentation works (for master vs 2)?

[GeoffreyBooth]

Hey, I merged master into 2 before the 2.0.0-beta3 release. After that release I made one additional commit on master with that new text in introduction.md, and the updated docs/v1 documentation files as a result. You are correct that the 2 branch’s introduction.md should be unchanged as a result.

But why are you seeing differences in rewriter.js etc.? Those should’ve gotten merged into 2 when I merged master in, unless I resolved some conflicts incorrectly?

[helixbass]

@GeoffreyBooth this was based on your comment in #4585 that you ran into merge conflicts/errors when merging those changes (which had been merged into master) into 2. And I don't see any sign of the changes from #4585 on current 2

[GeoffreyBooth]

Ah. I just reread my comment. I actually hadn’t merged in that commit from master, because of the conflicts. Thanks for figuring it out for me.