Merge pull request #26 from dart-lang/tweak-highlight

Improve a span highlighting edge case