extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-07-01 07:00:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Require block params (#4505)

Browse Source 
* Require block params

* Improve errors
This commit is contained in:
JT
2022-02-17 06:40:24 -05:00
committed by GitHub
parent f169a9be3b
commit 6e733f49bc
27 changed files with 149 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
crates/nu-parser/src/parser.rs
View File

@ -2894,7 +2894,7 @@ pub fn parse_block_expression(
working_set.enter_scope();
// Check to see if we have parameters
let (mut signature, amt_to_skip): (Option<Box<Signature>>, usize) = match output.first() {
let (signature, amt_to_skip): (Option<(Box<Signature>, Span)>, usize) = match output.first() {
Some(Token {
contents: TokenContents::Pipe,
span,
@ -2923,16 +2923,14 @@ pub fn parse_block_expression(
end
};
let (signature, err) = parse_signature_helper(
working_set,
Span {
start: start_point,
end: end_point,
},
);
let signature_span = Span {
start: start_point,
end: end_point,
};
let (signature, err) = parse_signature_helper(working_set, signature_span);
error = error.or(err);
(Some(signature), amt_to_skip)
(Some((signature, signature_span)), amt_to_skip)
}
_ => (None, 0),
};
@ -2942,19 +2940,48 @@ pub fn parse_block_expression(
// TODO: Finish this
if let SyntaxShape::Block(Some(v)) = shape {
if signature.is_none() && v.len() == 1 {
// We'll assume there's an `$it` present
let var_id = working_set.add_variable(b"$it".to_vec(), Type::Unknown);
if let Some((sig, sig_span)) = &signature {
if sig.num_positionals() != v.len() {
error = error.or_else(|| {
Some(ParseError::Expected(
format!(
"{} block parameter{}",
v.len(),
if v.len() > 1 { "s" } else { "" }
),
*sig_span,
))
});
}
let mut new_sigature = Signature::new("");
new_sigature.required_positional.push(PositionalArg {
var_id: Some(var_id),
name: "$it".into(),
desc: String::new(),
shape: SyntaxShape::Any,
for (expected, PositionalArg { name, shape, .. }) in
v.iter().zip(sig.required_positional.iter())
{
if expected != shape && *shape != SyntaxShape::Any {
error = error.or_else(|| {
Some(ParseError::ParameterMismatchType(
name.to_owned(),
expected.to_string(),
shape.to_string(),
*sig_span,
))
});
}
}
} else if !v.is_empty() {
error = error.or_else(|| {
Some(ParseError::Expected(
format!(
"{} block parameter{}",
v.len(),
if v.len() > 1 { "s" } else { "" }
),
Span {
start: span.start + 1,
end: span.start + 1,
},
))
});
signature = Some(Box::new(new_sigature));
}
}
@ -2962,7 +2989,7 @@ pub fn parse_block_expression(
error = error.or(err);
if let Some(signature) = signature {
output.signature = signature;
output.signature = signature.0;
} else if let Some(last) = working_set.delta.scope.last() {
// FIXME: this only supports the top $it. Is this sufficient?