From f68eed64d455ab24c77ebffbb6b8f01cbb94cbe2 Mon Sep 17 00:00:00 2001 From: Ibrahim Dursun Date: Tue, 4 Oct 2022 15:10:54 +0100 Subject: [PATCH] Handle error when opening file --- helix-term/src/commands/typed.rs | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs index 3cc338bd9831..93902aba9c0d 100644 --- a/helix-term/src/commands/typed.rs +++ b/helix-term/src/commands/typed.rs @@ -1622,15 +1622,21 @@ fn read_file_info_buffer( let filename = args.get(0).unwrap(); let path = PathBuf::from(filename.to_string()); if path.exists() { - let file = std::fs::File::open(path)?; - let mut reader = BufReader::new(file); - - match from_reader(&mut reader, doc.encoding()) { - Ok(contents) => { - let contents = Tendril::from(contents); - let selection = doc.selection(view.id); - let transaction = Transaction::insert(doc.text(), selection, contents); - doc.apply(&transaction, view.id); + match std::fs::File::open(path) { + Ok(file) => { + let mut reader = BufReader::new(file); + + match from_reader(&mut reader, doc.encoding()) { + Ok(contents) => { + let contents = Tendril::from(contents); + let selection = doc.selection(view.id); + let transaction = Transaction::insert(doc.text(), selection, contents); + doc.apply(&transaction, view.id); + } + Err(error) => cx + .editor + .set_error(format!("error reading file: {}", error)), + } } Err(error) => cx .editor