From 715c4b24d94c9e2fa70d5d59ce658b89fbde0392 Mon Sep 17 00:00:00 2001 From: Pascal Kuthe Date: Tue, 14 Feb 2023 20:00:54 +0100 Subject: [PATCH] Fix crash in goto_window_center at EOF (#5987) --- helix-term/src/commands.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index f8a96074df8b..a3c9f0b4abed 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -960,10 +960,9 @@ fn goto_window(cx: &mut Context, align: Align) { view.offset.vertical_offset + last_visual_line.saturating_sub(scrolloff + count) } }; - let visual_line = visual_line.clamp( - view.offset.vertical_offset + scrolloff, - view.offset.vertical_offset + last_visual_line.saturating_sub(scrolloff), - ); + let visual_line = visual_line + .max(view.offset.vertical_offset + scrolloff) + .min(view.offset.vertical_offset + last_visual_line.saturating_sub(scrolloff)); let pos = view .pos_at_visual_coords(doc, visual_line as u16, 0, false)