mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-06 04:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Allow last line in file to lack a line break character.

Browse source
This commit is contained in:
Nathan Vegdahl 2021-07-01 23:36:09 -07:00
parent 230248bbc3
commit 22dca3b111
4 changed files with 70 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

18
helix-core/src/syntax.rs
View file

@ -1758,10 +1758,20 @@ impl<I: Iterator<Item = HighlightEvent>> Iterator for Merge<I> {
self.next_event = self.iter.next();
Some(event)
}
// can happen if deleting and cursor at EOF, and diagnostic reaches past the end
(None, Some((_, _))) => {
self.next_span = None;
None
// Can happen if cursor at EOF and/or diagnostic reaches past the end.
// We need to actually emit events for the cursor-at-EOF situation,
// even though the range is past the end of the text. This needs to be
// handled appropriately by the drawing code by not assuming that
// all `Source` events point to valid indices in the rope.
(None, Some((span, range))) => {
let event = HighlightStart(Highlight(*span));
self.queue.push(HighlightEnd);
self.queue.push(Source {
start: range.start,
end: range.end,
});
self.next_span = self.spans.next();
Some(event)
}
(None, None) => None,
e => unreachable!("{:?}", e),