Properly fix `last_line` view calculation.

Turned out to be simpler than I thought.  Didn't even need to change the
other use-sites.
pull/376/head
Nathan Vegdahl 3 years ago
parent 1a9ae72fcb
commit 079d4ed86d

@ -330,16 +330,7 @@ impl EditorView {
// document or not. We only draw it if it's not an empty line. // 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(); 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 for (i, line) in (view.first_line..(last_line + 1)).enumerate() {
// 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() {
use helix_core::diagnostic::Severity; use helix_core::diagnostic::Severity;
if let Some(diagnostic) = doc.diagnostics().iter().find(|d| d.line == line) { if let Some(diagnostic) = doc.diagnostics().iter().find(|d| d.line == line) {
surface.set_stringn( surface.set_stringn(

@ -119,8 +119,9 @@ impl View {
pub fn last_line(&self, doc: &Document) -> usize { pub fn last_line(&self, doc: &Document) -> usize {
let height = self.area.height.saturating_sub(1); // - 1 for statusline let height = self.area.height.saturating_sub(1); // - 1 for statusline
std::cmp::min( std::cmp::min(
self.first_line + height as usize, // Saturating subs to make it inclusive zero indexing.
doc.text().len_lines() - 1, (self.first_line + height as usize).saturating_sub(1),
doc.text().len_lines().saturating_sub(1),
) )
} }

Loading…
Cancel
Save