Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-11-14 08:57:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix path command error messages (#2261). (#2276)

Browse source
This commit is contained in:
Warren Seine 2020-07-30 20:51:14 +02:00 committed by GitHub
parent 3282a509a9
commit aca7f71737
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crates/nu-cli/src/commands/path/basename.rs
View file

@ -27,8 +27,9 @@ impl WholeStreamCommand for PathBasename {
args: CommandArgs,
registry: &CommandRegistry,
) -> Result<OutputStream, ShellError> {
let tag = args.call_info.name_tag.clone();
let (DefaultArguments { rest }, input) = args.process(&registry).await?;
operate(input, rest, &action).await
operate(input, rest, &action, tag.span).await
}
fn examples(&self) -> Vec<Example> {

3
crates/nu-cli/src/commands/path/exists.rs
View file

@ -26,8 +26,9 @@ impl WholeStreamCommand for PathExists {
args: CommandArgs,
registry: &CommandRegistry,
) -> Result<OutputStream, ShellError> {
let tag = args.call_info.name_tag.clone();
let (DefaultArguments { rest }, input) = args.process(&registry).await?;
operate(input, rest, &action).await
operate(input, rest, &action, tag.span).await
}
fn examples(&self) -> Vec<Example> {

3
crates/nu-cli/src/commands/path/expand.rs
View file

@ -26,8 +26,9 @@ impl WholeStreamCommand for PathExpand {
args: CommandArgs,
registry: &CommandRegistry,
) -> Result<OutputStream, ShellError> {
let tag = args.call_info.name_tag.clone();
let (DefaultArguments { rest }, input) = args.process(&registry).await?;
operate(input, rest, &action).await
operate(input, rest, &action, tag.span).await
}
fn examples(&self) -> Vec<Example> {

3
crates/nu-cli/src/commands/path/extension.rs
View file

@ -27,8 +27,9 @@ impl WholeStreamCommand for PathExtension {
args: CommandArgs,
registry: &CommandRegistry,
) -> Result<OutputStream, ShellError> {
let tag = args.call_info.name_tag.clone();
let (DefaultArguments { rest }, input) = args.process(&registry).await?;
operate(input, rest, &action).await
operate(input, rest, &action, tag.span).await
}
fn examples(&self) -> Vec<Example> {

12
crates/nu-cli/src/commands/path/mod.rs
View file

@ -8,6 +8,7 @@ mod r#type;
use crate::prelude::*;
use nu_errors::ShellError;
use nu_protocol::{ColumnPath, Primitive, ReturnSuccess, ShellTypeName, UntaggedValue, Value};
use nu_source::Span;
use std::path::Path;
pub use basename::PathBasename;
@ -22,7 +23,7 @@ struct DefaultArguments {
rest: Vec<ColumnPath>,
}
fn handle_value<F>(action: &F, v: &Value) -> Result<Value, ShellError>
fn handle_value<F>(action: &F, v: &Value, span: Span) -> Result<Value, ShellError>
where
F: Fn(&Path) -> UntaggedValue + Send + 'static,
{
@ -32,9 +33,11 @@ where
| UntaggedValue::Primitive(Primitive::Line(s)) => action(s.as_ref()).into_value(v.tag()),
other => {
let got = format!("got {}", other.type_name());
return Err(ShellError::labeled_error(
return Err(ShellError::labeled_error_with_secondary(
"value is not string or path",
got,
span,
"originates from here".to_string(),
v.tag().span,
));
}
@ -46,6 +49,7 @@ async fn operate<F>(
input: crate::InputStream,
paths: Vec<ColumnPath>,
action: &'static F,
span: Span,
) -> Result<OutputStream, ShellError>
where
F: Fn(&Path) -> UntaggedValue + Send + Sync + 'static,
@ -53,14 +57,14 @@ where
Ok(input
.map(move |v| {
if paths.is_empty() {
ReturnSuccess::value(handle_value(&action, &v)?)
ReturnSuccess::value(handle_value(&action, &v, span)?)
} else {
let mut ret = v;
for path in &paths {
ret = ret.swap_data_by_column_path(
path,
Box::new(move |old| handle_value(&action, &old)),
Box::new(move |old| handle_value(&action, &old, span)),
)?;
}

3
crates/nu-cli/src/commands/path/type.rs
View file

@ -27,8 +27,9 @@ impl WholeStreamCommand for PathType {
args: CommandArgs,
registry: &CommandRegistry,
) -> Result<OutputStream, ShellError> {
let tag = args.call_info.name_tag.clone();
let (DefaultArguments { rest }, input) = args.process(&registry).await?;
operate(input, rest, &action).await
operate(input, rest, &action, tag.span).await
}
fn examples(&self) -> Vec<Example> {