TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix crash in picker preview for invalid ranges

Browse source
This commit is contained in:
Pascal Kuthe 2023-09-12 21:11:07 +02:00 • committed by Blaž Hrastnik
parent e41bee6ac6
commit e9d0bd7aef
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
helix-term/src/ui/picker.rs
View file

@ -112,9 +112,9 @@ impl Preview<'_, '_> {
/// Alternate text to show for the preview. /// Alternate text to show for the preview.
fn placeholder(&self) -> &str { fn placeholder(&self) -> &str {
match *self { match *self {
Self::EditorDocument(_) => "<File preview>", Self::EditorDocument(_) => "<Invalid file location>",
Self::Cached(preview) => match preview { Self::Cached(preview) => match preview {
CachedPreview::Document(_) => "<File preview>", CachedPreview::Document(_) => "<Invalid file location>",
CachedPreview::Binary => "<Binary file>", CachedPreview::Binary => "<Binary file>",
CachedPreview::LargeFile => "<File too large to preview>", CachedPreview::LargeFile => "<File too large to preview>",
CachedPreview::NotFound => "<File not found>", CachedPreview::NotFound => "<File not found>",
@ -693,8 +693,14 @@ impl<T: Item + 'static> Picker<T> {
if let Some((path, range)) = self.current_file(cx.editor) { if let Some((path, range)) = self.current_file(cx.editor) {
let preview = self.get_preview(path, cx.editor); let preview = self.get_preview(path, cx.editor);
let doc = match preview.document() { let doc = match preview.document() {
Some(doc) => doc, Some(doc)
None => { if range.map_or(true, |(start, end)| {
start <= end && end <= doc.text().len_lines()
}) =>
{
doc
}
_ => {
let alt_text = preview.placeholder(); let alt_text = preview.placeholder();
let x = inner.x + inner.width.saturating_sub(alt_text.len() as u16) / 2; let x = inner.x + inner.width.saturating_sub(alt_text.len() as u16) / 2;
let y = inner.y + inner.height / 2; let y = inner.y + inner.height / 2;