Merge pull request dart-lang/source_span#26 from dart-lang/tweak-highlight Improve a span highlighting edge case