greg/just
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split command correctly on leading whitespace

Browse Source
This commit is contained in:
Casey Rodarmor 2016-10-02 15:46:25 -07:00
parent f81e7d8953
commit c970f507ad
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main.rs
View File

@ -130,7 +130,7 @@ struct Justfile<'a> {
fn parse<'a>(text: &'a str) -> Result<Justfile, Error> { fn parse<'a>(text: &'a str) -> Result<Justfile, Error> {
let shebang_re = re(r"^\s*#!(.*)$"); let shebang_re = re(r"^\s*#!(.*)$");
let comment_re = re(r"^\s*#[^!].*$"); let comment_re = re(r"^\s*#[^!].*$");
let command_re = re(r"^(\s+)(.*)$"); let command_re = re(r"^(\s+).*$");
let blank_re = re(r"^\s*$"); let blank_re = re(r"^\s*$");
let label_re = re(r"^([a-z](-[a-z]|[a-z])*):(.*)$"); let label_re = re(r"^([a-z](-[a-z]|[a-z])*):(.*)$");
let name_re = re(r"^[a-z](-[a-z]|[a-z])*$"); let name_re = re(r"^[a-z](-[a-z]|[a-z])*$");
@ -157,8 +157,7 @@ fn parse<'a>(text: &'a str) -> Result<Justfile, Error> {
found: leading_whitespace, found: leading_whitespace,
})); }));
} }
let command = captures.at(2).unwrap(); recipe.commands.push(line.split_at(recipe.leading_whitespace.len()).1);
recipe.commands.push(command);
current_recipe = Some(recipe); current_recipe = Some(recipe);
continue; continue;
}, },