Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make better error message

Browse Source
This commit is contained in:
WindSoilder 2024-07-17 07:55:44 +08:00
parent bb6bf03607
commit 37e93f7189
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crates/nu-command/src/generators/generate.rs
View File

@ -80,7 +80,7 @@ used as the next argument to the closure, otherwise generation stops.
// A type of Option<S> is used to represent state. Invocation // A type of Option<S> is used to represent state. Invocation
// will stop on None. Using Option<S> allows functions to output // will stop on None. Using Option<S> allows functions to output
// one final value before stopping. // one final value before stopping.
let mut state = Some(get_initial_state(initial, &block.signature)?); let mut state = Some(get_initial_state(initial, &block.signature, call.head)?);
// let mut state = Some(initial); // let mut state = Some(initial);
let iter = std::iter::from_fn(move || { let iter = std::iter::from_fn(move || {
let arg = state.take()?; let arg = state.take()?;
@ -183,7 +183,11 @@ mod test {
} }
} }
fn get_initial_state(initial: Option<Value>, signature: &Signature) -> Result<Value, ShellError> { fn get_initial_state(
initial: Option<Value>,
signature: &Signature,
span: Span,
) -> Result<Value, ShellError> {
match initial { match initial {
Some(v) => Ok(v), Some(v) => Ok(v),
None => { None => {
@ -193,19 +197,22 @@ fn get_initial_state(initial: Option<Value>, signature: &Signature) -> Result<Va
Ok(v.clone()) Ok(v.clone())
} else { } else {
Err(ShellError::GenericError { Err(ShellError::GenericError {
error: "".to_string(), error: "The initial value is missing".to_string(),
msg: "bb".to_string(), msg: "Missing intial value".to_string(),
help: None, span: Some(span),
span: None, help: Some("Provide initial value to generate, or assigning default value to closure parameter".to_string()),
inner: vec![], inner: vec![],
}) })
} }
} else { } else {
Err(ShellError::GenericError { Err(ShellError::GenericError {
error: "aa".to_string(), error: "The initial value is missing".to_string(),
msg: "bb".to_string(), msg: "Missing intial value".to_string(),
help: None, span: Some(span),
span: None, help: Some(
"Provide initial value in generate, or assigning default value to closure parameter"
.to_string(),
),
inner: vec![], inner: vec![],
}) })
} }