diff options
| -rw-r--r-- | helix-term/src/ui/editor.rs | 11 | ||||
| -rw-r--r-- | helix-view/src/view.rs | 5 |
2 files changed, 4 insertions, 12 deletions
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs index 769771af..6a588e12 100644 --- a/helix-term/src/ui/editor.rs +++ b/helix-term/src/ui/editor.rs @@ -330,16 +330,7 @@ impl EditorView { // document or not. We only draw it if it's not an empty line. let draw_last = text.line_to_byte(last_line) < text.len_bytes(); - // This is a little confuding: We can't use the `last_line` variable for - // our iteration below, because there's a mismatch between the - // inclusive/exclusiveness of the screen-based last line and the - // text-based last line. So we compute what we actually need specially here. - let last_line_number = std::cmp::min( - view.first_line + view.area.height.saturating_sub(1) as usize, - doc.text().len_lines(), - ); - - for (i, line) in (view.first_line..last_line_number).enumerate() { + for (i, line) in (view.first_line..(last_line + 1)).enumerate() { use helix_core::diagnostic::Severity; if let Some(diagnostic) = doc.diagnostics().iter().find(|d| d.line == line) { surface.set_stringn( diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs index 24df7a4f..ccb61646 100644 --- a/helix-view/src/view.rs +++ b/helix-view/src/view.rs @@ -119,8 +119,9 @@ impl View { pub fn last_line(&self, doc: &Document) -> usize { let height = self.area.height.saturating_sub(1); // - 1 for statusline std::cmp::min( - self.first_line + height as usize, - doc.text().len_lines() - 1, + // Saturating subs to make it inclusive zero indexing. + (self.first_line + height as usize).saturating_sub(1), + doc.text().len_lines().saturating_sub(1), ) } |