Merge pull request dart-lang/source_span#29 from dart-lang/fixes

Fix a couple more highlight bugs