From e9d0bd7aefda6962b56245eb7d0f56b5d2fa4859 Mon Sep 17 00:00:00 2001 From: Pascal Kuthe Date: Tue, 12 Sep 2023 21:11:07 +0200 Subject: fix crash in picker preview for invalid ranges --- helix-term/src/ui/picker.rs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs index 94a69b0d..7e745f72 100644 --- a/helix-term/src/ui/picker.rs +++ b/helix-term/src/ui/picker.rs @@ -112,9 +112,9 @@ impl Preview<'_, '_> { /// Alternate text to show for the preview. fn placeholder(&self) -> &str { match *self { - Self::EditorDocument(_) => "", + Self::EditorDocument(_) => "", Self::Cached(preview) => match preview { - CachedPreview::Document(_) => "", + CachedPreview::Document(_) => "", CachedPreview::Binary => "", CachedPreview::LargeFile => "", CachedPreview::NotFound => "", @@ -693,8 +693,14 @@ impl Picker { if let Some((path, range)) = self.current_file(cx.editor) { let preview = self.get_preview(path, cx.editor); let doc = match preview.document() { - Some(doc) => doc, - None => { + Some(doc) + if range.map_or(true, |(start, end)| { + start <= end && end <= doc.text().len_lines() + }) => + { + doc + } + _ => { let alt_text = preview.placeholder(); let x = inner.x + inner.width.saturating_sub(alt_text.len() as u16) / 2; let y = inner.y + inner.height / 2; -- cgit v1.2.3-70-g09d2