extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-05-09 12:34:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: map IOError to shell errors

Browse Source
This commit is contained in:
Florent Vilmart 2025-04-17 16:59:25 -06:00
parent c61c60285c
commit 75e5cc42ce
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
crates/nu-command/src/platform/input/input_.rs
View File

@ -95,6 +95,7 @@ impl Command for Input {
.map(|l| if l < 0 { 0 } else { l as usize }) .map(|l| if l < 0 { 0 } else { l as usize })
.unwrap_or(HISTORY_SIZE); .unwrap_or(HISTORY_SIZE);
let max_history_span = call.get_flag_span(stack, "max-history"); let max_history_span = call.get_flag_span(stack, "max-history");
let history_file_span = call.get_flag_span(stack, "history-file");
let default_str = match (&prompt_str, &default_val) { let default_str = match (&prompt_str, &default_val) {
(Some(_prompt), Some(val)) => format!("(default: {val}) "), (Some(_prompt), Some(val)) => format!("(default: {val}) "),
@ -116,13 +117,29 @@ impl Command for Input {
}; };
let mut history = match file_history { let mut history = match file_history {
Ok(h) => h, Ok(h) => h,
Err(_e) => { Err(e) => match e.0 {
return Err(ShellError::IncorrectValue { reedline::ReedlineErrorVariants::IOError(err) => {
msg: "invalid max_history size".to_string(), return Err(ShellError::IncorrectValue {
val_span: max_history_span.expect("max-history should be set"), msg: err.to_string(),
call_span: call.head, val_span: history_file_span.expect("history-file should be set"),
}); call_span: call.head,
} });
}
reedline::ReedlineErrorVariants::OtherHistoryError(msg) => {
return Err(ShellError::IncorrectValue {
msg: msg.to_string(),
val_span: max_history_span.expect("max-history should be set"),
call_span: call.head,
});
}
_ => {
return Err(ShellError::IncorrectValue {
msg: "unable to create history".to_string(),
val_span: call.head,
call_span: call.head,
});
}
},
}; };
if let Some(vals) = history_entries { if let Some(vals) = history_entries {