Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-27 21:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add better help message for concatenation error.

Browse source
This commit is contained in:
Ian Manske 2024-11-23 18:17:26 -08:00
parent caaa2472ec
commit 9fb54a8f46
1 changed files with 41 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
crates/nu-parser/src/type_check.rs
View file

@ -367,12 +367,50 @@ pub fn math_result_type(
(Type::Any, _) | (_, Type::Any) => (Type::Any, None),
_ => {
*op = Expression::garbage(working_set, op.span);
type_error("concatenation", op, lhs, rhs, |ty| {
let is_supported = |ty: &Type| {
matches!(
ty,
Type::List(_) | Type::Table(_) | Type::String | Type::Binary
Type::List(_)
| Type::Table(_)
| Type::String
| Type::Binary
| Type::Any
| Type::Custom(_)
)
})
};
let help = if matches!(lhs.ty, Type::List(_) | Type::Table(_))
|| matches!(rhs.ty, Type::List(_) | Type::Table(_))
{
Some("if you meant to append a value to a list or a record to a table, use the `append` command or wrap the value in a list. For example: `$list ++ $value` should be `$list ++ [$value]` or `$list | append $value`.")
} else {
None
};
let err = match (is_supported(&lhs.ty), is_supported(&rhs.ty)) {
(true, true) => ParseError::OperatorTypeMismatch {
op: "concatentation",
lhs: lhs.ty.clone(),
rhs: rhs.ty.clone(),
op_span: op.span,
lhs_span: lhs.span,
rhs_span: rhs.span,
help,
},
(true, false) => ParseError::OperatorUnsupportedType {
op: "concatentation",
unsupported: rhs.ty.clone(),
op_span: op.span,
unsupported_span: rhs.span,
help,
},
(false, _) => ParseError::OperatorUnsupportedType {
op: "concatentation",
unsupported: lhs.ty.clone(),
op_span: op.span,
unsupported_span: lhs.span,
help,
},
};
(Type::Any, Some(err))
}
},
Operator::Boolean(operator) => match (&lhs.ty, &rhs.ty) {