Allow newlines when parsing recipes

src/parser.rs

@@ -677,9 +677,14 @@ impl<'run, 'src> Parser<'run, 'src> {
     let name = self.parse_name()?;
 
     let mut positional = Vec::new();
-
-    while self.next_is(Identifier) || self.next_is(Dollar) {
-      positional.push(self.parse_parameter(ParameterKind::Singular)?);
+    loop {
+      if self.next_is(Identifier) || self.next_is(Dollar) {
+        positional.push(self.parse_parameter(ParameterKind::Singular)?);
+      } else if self.next_is(Eol) {
+        self.accept(Eol)?;
+      } else {
+        break;
+      }
     }
 
     let kind = if self.accepted(Plus)? {
@@ -703,6 +708,9 @@ impl<'run, 'src> Parser<'run, 'src> {
     } else {
       None
     };
+    while self.next_is(Eol) {
+      self.accept(Eol)?;
+    }
 
     self.expect(Colon)?;
 
@@ -2088,13 +2096,13 @@ mod tests {
   error! {
     name:   missing_colon,
     input:  "a b c\nd e f",
-    offset:  5,
-    line:   0,
+    offset:  11,
+    line:   1,
     column: 5,
-    width:  1,
+    width:  0,
     kind:   UnexpectedToken{
-      expected: vec![Asterisk, Colon, Dollar, Equals, Identifier, Plus],
-      found:    Eol
+      expected: vec![Asterisk, Colon, Dollar, Eol, Equals, Identifier, Plus],
+      found:    Eof
     },
   }
 
@@ -2228,7 +2236,7 @@ mod tests {
     column: 8,
     width:  0,
     kind:   UnexpectedToken {
-      expected: vec![Asterisk, Colon, Dollar, Equals, Identifier, Plus],
+      expected: vec![Asterisk, Colon, Dollar, Eol, Equals, Identifier, Plus],
       found:    Eof
     },
   }

tests/error_messages.rs

@@ -62,7 +62,7 @@ fn file_path_is_indented_if_justfile_is_long() {
     .status(EXIT_FAILURE)
     .stderr(
       "
-error: Expected '*', ':', '$', identifier, or '+', but found end of file
+error: Expected '*', ':', '$', end of line, identifier, or '+', but found end of file
   ——▶ justfile:20:4
    │
 20 │ foo
@@ -80,7 +80,7 @@ fn file_paths_are_relative() {
     .status(EXIT_FAILURE)
     .stderr(format!(
       "
-error: Expected '*', ':', '$', identifier, or '+', but found end of file
+error: Expected '*', ':', '$', end of line, identifier, or '+', but found end of file
  ——▶ foo{}bar.just:1:4
   │
 1 │ baz
@@ -101,7 +101,7 @@ fn file_paths_not_in_subdir_are_absolute() {
     .args(["--justfile", "foo/justfile"])
     .status(EXIT_FAILURE)
     .stderr_regex(
-      r"error: Expected '\*', ':', '\$', identifier, or '\+', but found end of file
+      r"error: Expected '\*', ':', '\$', end of line, identifier, or '\+', but found end of file
  ——▶ /.*/bar.just:1:4
   │
 1 │ baz

tests/lib.rs

@@ -65,6 +65,7 @@ mod json;
 mod line_prefixes;
 mod misc;
 mod modules;
+mod multi_line_recipe_signatures;
 mod multibyte_char;
 mod newline_escape;
 mod no_cd;

tests/misc.rs

@@ -1284,7 +1284,7 @@ test! {
   justfile: "foo 'bar'",
   args:     ("foo"),
   stdout:   "",
-  stderr:   "error: Expected '*', ':', '$', identifier, or '+', but found string
+  stderr:   "error: Expected '*', ':', '$', end of line, identifier, or '+', but found string
  ——▶ justfile:1:5
   │
 1 │ foo 'bar'
@@ -1465,7 +1465,7 @@ foo *a +b:
   echo {{a}} {{b}}
 ",
   stdout:   "",
-  stderr:   "error: Expected \':\' or \'=\', but found \'+\'
+  stderr:   "error: Expected \':\', end of line, or \'=\', but found \'+\'
  ——▶ justfile:1:8
   │
 1 │ foo *a +b:
@@ -1481,7 +1481,7 @@ foo +a *b:
   echo {{a}} {{b}}
 ",
   stdout:   "",
-  stderr:   "error: Expected \':\' or \'=\', but found \'*\'
+  stderr:   "error: Expected \':\', end of line, or \'=\', but found \'*\'
  ——▶ justfile:1:8
   │
 1 │ foo +a *b:
@@ -1890,7 +1890,7 @@ test! {
       echo {{foo}}
   ",
   stderr: "
-    error: Expected '*', ':', '$', identifier, or '+', but found '='
+    error: Expected '*', ':', '$', end of line, identifier, or '+', but found '='
      ——▶ justfile:1:5
       │
     1 │ foo = 'bar'

tests/multi_line_recipe_signatures.rs

@@ -0,0 +1,15 @@
+use super::*;
+
+#[test]
+fn foo() {
+  Test::new()
+    .justfile(
+      "
+      foo
+        bar:
+        @echo bar
+    ",
+    )
+    .stdout("bar\n")
+    .run();
+}

tests/slash_operator.rs

@@ -69,7 +69,7 @@ fn default_un_parenthesized() {
     )
     .stderr(
       "
-      error: Expected '*', ':', '$', identifier, or '+', but found '/'
+      error: Expected '*', ':', '$', end of line, identifier, or '+', but found '/'
        ——▶ justfile:1:11
         │
       1 │ foo x='a' / 'b':