extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-01-24 23:29:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

early return for parsing closure and block with interchanged shape (#7618)

Browse Source
This commit is contained in:
Kangaxx-0 2023-01-01 02:26:51 -08:00 committed by GitHub
parent 27b06358ea
commit 614bc2a943
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4176,7 +4176,7 @@ pub fn parse_closure_expression(
} else { } else {
return ( return (
garbage(span), garbage(span),
Some(ParseError::Expected("block".into(), span)), Some(ParseError::Expected("closure".into(), span)),
); );
} }
if bytes.ends_with(b"}") { if bytes.ends_with(b"}") {
@ -4248,7 +4248,7 @@ pub fn parse_closure_expression(
error = error.or_else(|| { error = error.or_else(|| {
Some(ParseError::Expected( Some(ParseError::Expected(
format!( format!(
"{} block parameter{}", "{} closure parameter{}",
v.len(), v.len(),
if v.len() > 1 { "s" } else { "" } if v.len() > 1 { "s" } else { "" }
), ),

5
src/tests/test_parser.rs
View File

@ -349,7 +349,10 @@ fn proper_missing_param() -> TestResult {
#[test] #[test]
fn block_arity_check1() -> TestResult { fn block_arity_check1() -> TestResult {
fail_test(r#"ls | each { |x, y, z| 1}"#, "expected 2 block parameters") fail_test(
r#"ls | each { |x, y, z| 1}"#,
"expected 2 closure parameters",
)
} }
#[test] #[test]