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

Mention the actual output type on an OutputMismatch error

Browse Source
This commit is contained in:
Devyn Cairns 2024-07-11 17:28:50 -07:00
parent acd4cb83e8
commit 66589b891d
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/nu-parser/src/type_check.rs
View File

@ -1055,7 +1055,11 @@ pub fn check_block_input_output(working_set: &StateWorkingSet, block: &Block) ->
.span
};
output_errors.push(ParseError::OutputMismatch(output_type.clone(), span))
output_errors.push(ParseError::OutputMismatch(
output_type.clone(),
current_output_type.clone(),
span,
))
}
}

8
crates/nu-protocol/src/errors/parse_error.rs
View File

@ -61,7 +61,11 @@ pub enum ParseError {
#[error("Command output doesn't match {0}.")]
#[diagnostic(code(nu::parser::output_type_mismatch))]
OutputMismatch(Type, #[label("command doesn't output {0}")] Span),
OutputMismatch(
Type,
Type,
#[label("expected {0}, but command outputs {1}")] Span,
),
#[error("Type mismatch during operation.")]
#[diagnostic(code(nu::parser::type_mismatch))]
@ -554,7 +558,7 @@ impl ParseError {
ParseError::TypeMismatch(_, _, s) => *s,
ParseError::TypeMismatchHelp(_, _, s, _) => *s,
ParseError::InputMismatch(_, s) => *s,
ParseError::OutputMismatch(_, s) => *s,
ParseError::OutputMismatch(_, _, s) => *s,
ParseError::MissingRequiredFlag(_, s) => *s,
ParseError::IncompleteMathExpression(s) => *s,
ParseError::UnknownState(_, s) => *s,