mirror of
https://github.com/helix-editor/helix.git
synced 2024-11-23 01:46:18 +04:00
handle NotFound error when reading histfile before it has been created
This commit is contained in:
parent
32512a02b4
commit
69e40a3ea5
@ -1,7 +1,7 @@
|
||||
use helix_loader::command_histfile;
|
||||
use std::{
|
||||
fs::{File, OpenOptions},
|
||||
io::{self, BufRead, BufReader, Lines, Write},
|
||||
io::{self, BufRead, BufReader, Write},
|
||||
path::PathBuf,
|
||||
};
|
||||
|
||||
@ -22,14 +22,23 @@ pub fn push_history(register: char, line: &str) {
|
||||
writeln!(file, "{}", line).unwrap();
|
||||
}
|
||||
|
||||
fn read_histfile(filepath: PathBuf) -> Lines<BufReader<File>> {
|
||||
// TODO: do something about this unwrap
|
||||
BufReader::new(File::open(filepath).unwrap()).lines()
|
||||
fn read_histfile(filepath: PathBuf) -> Vec<String> {
|
||||
match File::open(filepath) {
|
||||
Ok(file) => {
|
||||
BufReader::new(file)
|
||||
.lines()
|
||||
.collect::<io::Result<Vec<String>>>()
|
||||
// TODO: do something about this unwrap
|
||||
.unwrap()
|
||||
}
|
||||
Err(e) => match e.kind() {
|
||||
io::ErrorKind::NotFound => Vec::new(),
|
||||
// TODO: do something about this panic
|
||||
_ => panic!(),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
pub fn read_command_history() -> Vec<String> {
|
||||
read_histfile(command_histfile())
|
||||
.collect::<io::Result<Vec<String>>>()
|
||||
// TODO: do something about this unwrap
|
||||
.unwrap()
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user