Improve FileSpan.context

Previously, if FileSpan.end was directly after a newline,
FileSpan.context would include the entire next line in the span. Then
when this span was highlighted, the end would point confusingly to the
beginning of that next line.