extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-06-30 14:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

return Error if get meet nothing and without "i" (#7002)

Browse Source
This commit is contained in:
Access
2022-12-31 19:27:09 +08:00
committed by GitHub
parent 9382dd6d55
commit 81a7d17b33
3 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
crates/nu-command/src/filters/get.rs
View File

@ -74,7 +74,29 @@ impl Command for Get {
Err(_) => Ok(Value::Nothing { span: call.head }.into_pipeline_data()),
}
} else {
output
match output {
Ok(val) => {
let val_check = val.into_value(span);
match val_check {
Value::List {
ref vals,
span: spanchild,
} => {
if vals.iter().any(|unit| unit.is_empty()) {
Err(nu_protocol::ShellError::CantFindColumn(
"Empty cell".to_string(),
spanchild,
span,
))
} else {
Ok(val_check.into_pipeline_data())
}
}
val => Ok(val.into_pipeline_data()),
}
}
Err(e) => Err(e),
}
}
} else {
let mut output = vec![];
@ -87,8 +109,18 @@ impl Command for Get {
let val = input.clone().follow_cell_path(&path.members, !sensitive);
if ignore_errors {
if let Ok(val) = val {
output.push(val);
match val {
Ok(Value::Nothing { span: spanchild }) => {
return Err(nu_protocol::ShellError::CantFindColumn(
"Nothing".to_string(),
spanchild,
span,
));
}
Ok(val) => {
output.push(val);
}
Err(_) => {}
}
} else {
output.push(val?);