extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-12-22 15:13:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow pipelines across multiple lines if end in pipe (#643)

Browse Source 
* Allow pipelines across multiple lines if end in pipe

* Add validation support
This commit is contained in:
JT 2022-01-02 16:27:58 +11:00 committed by GitHub
parent ffaaa53526
commit c9dcd212ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
crates/nu-parser/src/lite_parse.rs
View File

@ -85,16 +85,37 @@ pub fn lite_parse(tokens: &[Token]) -> (LiteBlock, Option<ParseError>) {
let mut curr_pipeline = LiteStatement::new();
let mut curr_command = LiteCommand::new();
let mut last_token_was_pipe = false;
for token in tokens.iter() {
match &token.contents {
TokenContents::Item => curr_command.push(token.span),
TokenContents::Item => {
curr_command.push(token.span);
last_token_was_pipe = false;
}
TokenContents::Pipe => {
if !curr_command.is_empty() {
curr_pipeline.push(curr_command);
curr_command = LiteCommand::new();
}
last_token_was_pipe = true;
}
TokenContents::Eol | TokenContents::Semicolon => {
TokenContents::Eol => {
if !last_token_was_pipe {
if !curr_command.is_empty() {
curr_pipeline.push(curr_command);
curr_command = LiteCommand::new();
}
if !curr_pipeline.is_empty() {
block.push(curr_pipeline);
curr_pipeline = LiteStatement::new();
}
}
}
TokenContents::Semicolon => {
if !curr_command.is_empty() {
curr_pipeline.push(curr_command);
@ -106,6 +127,8 @@ pub fn lite_parse(tokens: &[Token]) -> (LiteBlock, Option<ParseError>) {
curr_pipeline = LiteStatement::new();
}
last_token_was_pipe = false;
}
TokenContents::Comment => {
curr_command.comments.push(token.span);
@ -121,5 +144,15 @@ pub fn lite_parse(tokens: &[Token]) -> (LiteBlock, Option<ParseError>) {
block.push(curr_pipeline);
}
(block, None)
if last_token_was_pipe {
(
block,
Some(ParseError::UnexpectedEof(
"pipeline missing end".into(),
tokens[tokens.len() - 1].span,
)),
)
} else {
(block, None)
}
}

11
src/tests/test_parser.rs
View File

@ -123,3 +123,14 @@ fn let_not_statement() -> TestResult {
fn for_in_missing_var_name() -> TestResult {
fail_test("for in", "missing")
}
#[test]
fn multiline_pipe_in_block() -> TestResult {
run_test(
r#"do {
echo hello |
str length
}"#,
"5",
)
}