Fix syntax highlighting

Don't break highlighting on multi-line spans (multi-line comments for
example)
Merge pull request #6843 from evanlucas/bug/6546

Fix syntax highlighting