Unfortunately, this patch also has an issue:
XSDError in data/syntax/d.xml, at line 413, column 53: Element context is missing required attribute lineEndContext.
Can you provide an update to fix it?
Also committed, hope everything merged nicely and is correct. I had to update the folding unit test data again, but I guess that is fine.
If you find any issues, please provide another patch :-)