holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow parens around signatures (#6444)

Browse Source 
* DRAFT: make var dollar optional

* couple fixes

* fix some tests + cleanup

* allow parens around signature

* clippy
This commit is contained in:
JT 2022-08-30 16:17:10 +12:00 committed by GitHub
parent 9c58f2a522
commit a03fb946d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3085,12 +3085,17 @@ pub fn parse_signature(
let mut start = span.start; let mut start = span.start;
let mut end = span.end; let mut end = span.end;
let mut has_paren = false;
if bytes.starts_with(b"[") { if bytes.starts_with(b"[") {
start += 1; start += 1;
} else if bytes.starts_with(b"(") {
has_paren = true;
start += 1;
} else { } else {
error = error.or_else(|| { error = error.or_else(|| {
Some(ParseError::Expected( Some(ParseError::Expected(
"[".into(), "[ or (".into(),
Span { Span {
start, start,
end: start + 1, end: start + 1,
@ -3099,10 +3104,15 @@ pub fn parse_signature(
}); });
} }
if bytes.ends_with(b"]") { if (has_paren && bytes.ends_with(b")")) || (!has_paren && bytes.ends_with(b"]")) {
end -= 1; end -= 1;
} else { } else {
error = error.or_else(|| Some(ParseError::Unclosed("]".into(), Span { start: end, end }))); error = error.or_else(|| {
Some(ParseError::Unclosed(
"] or )".into(),
Span { start: end, end },
))
});
} }
let (sig, err) = let (sig, err) =
@ -4092,6 +4102,8 @@ pub fn parse_value(
b'(' => { b'(' => {
if let (expr, None) = parse_range(working_set, span, expand_aliases_denylist) { if let (expr, None) = parse_range(working_set, span, expand_aliases_denylist) {
return (expr, None); return (expr, None);
} else if matches!(shape, SyntaxShape::Signature) {
return parse_signature(working_set, span, expand_aliases_denylist);
} else { } else {
return parse_full_cell_path(working_set, None, span, expand_aliases_denylist); return parse_full_cell_path(working_set, None, span, expand_aliases_denylist);
} }